Commits · 258796c40c993471ff39e0bc5c1aaeeb72e02498 · nexedi / gitlab-ce

26 May, 2018 2 commits
- Geo: Update docs on push to secondary current limitations · 258796c4
  Ash McKenzie authored May 26, 2018
  
  258796c4
- Geo: Redirect secondary HTTP git push to primary · 8f71ff07
  Ash McKenzie authored May 26, 2018
  
  8f71ff07
25 May, 2018 34 commits
- Merge branch 'leipert-move-ee-specific-pipeline-scss' into 'master' · 6a083e88
  Annabel Gray authored May 25, 2018
```
Move EE specific code from app/assets/stylesheets/pages/pipelines.scss

See merge request gitlab-org/gitlab-ee!5852
```
  6a083e88
- Move EE specific code from app/assets/stylesheets/pages/pipelines.scss · 6fd5094b
  Lukas Eipert authored May 25, 2018
  
  6fd5094b
- Merge branch 'ee-bootstrap4' into 'master' · aeed5f36
  Mike Greiling authored May 25, 2018
```
Upgrade to Bootstrap 4 (EE)

Closes #5767

See merge request gitlab-org/gitlab-ee!5474
```
  aeed5f36
- Upgrade to Bootstrap 4 (EE) · 4c982055
  Clement Ho authored May 25, 2018
  
  4c982055
- Merge branch 'ce-to-ee-2018-05-25' into 'master' · 16a757a7
  Stan Hu authored May 25, 2018
```
CE upstream - 2018-05-25 18:23 UTC

See merge request gitlab-org/gitlab-ee!5857
```
  16a757a7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25 · 5f043540
  GitLab Bot authored May 25, 2018
  
  5f043540
- Merge branch... · 6f4935bc
  Rémy Coutable authored May 25, 2018
```
Merge branch '46740-projectmilestones-setting-start_date-via-the-api-requires-a-second-parameter' into 'master'

Resolve "ProjectMilestones: Setting start_date via the API requires a second parameter"

Closes #46740

See merge request gitlab-org/gitlab-ce!19133
```
  6f4935bc
- Merge branch 'ce-to-ee-2018-05-25' into 'master' · 429848e9
  Rémy Coutable authored May 25, 2018
```
CE upstream - 2018-05-25 15:30 UTC

See merge request gitlab-org/gitlab-ee!5855
```
  429848e9
- Resolve conflict in app/views/help/index.html.haml · 7695a32e
  Rémy Coutable authored May 25, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7695a32e
- Resolve conflict in README.md · 6e84ba57
  Rémy Coutable authored May 25, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6e84ba57
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25 · 0d2c6bbf
  GitLab Bot authored May 25, 2018
```
# Conflicts:
#	README.md
#	app/views/help/index.html.haml

[ci skip]
```
  0d2c6bbf
- Merge branch 'authentiq-gem-update' into 'master' · f0f63b79
  Rémy Coutable authored May 25, 2018
```
Authentiq gem update

See merge request gitlab-org/gitlab-ce!19137
```
  f0f63b79
- Merge branch 'ce-to-ee-2018-05-25' into 'master' · 144a6dc1
  Phil Hughes authored May 25, 2018
```
CE upstream - 2018-05-25 12:30 UTC

See merge request gitlab-org/gitlab-ee!5850
```
  144a6dc1
- Merge branch '45404-remove-gemnasium-badge-from-project-s-readme-md' into 'master' · b0777168
  Rémy Coutable authored May 25, 2018
```
Remove Gemnasium badge from project's README.md

Closes #45404

See merge request gitlab-org/gitlab-ce!19136
```
  b0777168
- Merge branch 'docs/remove-dead-link' into 'master' · ce1a9a57
  Achilleas Pipinellis authored May 25, 2018
```
Remove dead link to Google Drive

See merge request gitlab-org/gitlab-ce!19139
```
  ce1a9a57
- Merge branch 'rs-projects-destroy-service-parity' into 'master' · e73b71ec
  Rémy Coutable authored May 25, 2018
```
Bring CE-EE parity to app/services/projects/destroy_service.rb

See merge request gitlab-org/gitlab-ce!19111
```
  e73b71ec
- Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' · cc570b6c
  Rémy Coutable authored May 25, 2018
```
Resolve "gitlab 10.8 assumes that installation is a git working copy."

Closes #46600

See merge request gitlab-org/gitlab-ce!19125
```
  cc570b6c
- Merge branch 'add-embedded-snippets-docs' into 'master' · f5e6300b
  Achilleas Pipinellis authored May 25, 2018
```
Init documentation for embedded snippets

See merge request gitlab-org/gitlab-ce!19120
```
  f5e6300b
- Init documentation for embedded snippets · c997e776
  Andreas Kämmerle authored May 25, 2018
  
  c997e776
- Merge branch 'add-embedded-snippets-docs-ee' into 'master' · 9aeb13bb
  Achilleas Pipinellis authored May 25, 2018
```
Add embedded snippets docs ee

See merge request gitlab-org/gitlab-ee!5836
```
  9aeb13bb
- Add embedded snippets docs ee · 2323809c
  Achilleas Pipinellis authored May 25, 2018
  
  2323809c
- Merge branch 'ee-46600-fix-gitlab-revision-when-not-in-git-repo' into 'master' · 5bc22a8b
  Rémy Coutable authored May 25, 2018
```
[EE] Replace Gitlab::REVISION with Gitlab.revision and handle installations…

Closes gitlab-ce#46600

See merge request gitlab-org/gitlab-ee!5832
```
  5bc22a8b
- Resolve conflict with spec/javascripts/api_spec.js · 7875e343
  André Luís authored May 25, 2018
  
  7875e343
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25 · 058cca73
  GitLab Bot authored May 25, 2018
```
# Conflicts:
#	spec/javascripts/api_spec.js

[ci skip]
```
  058cca73
- Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master' · 4e257213
  Filipa Lacerda authored May 25, 2018
```
Resolve "Typo on the empty Pipelines page"

Closes #46768

See merge request gitlab-org/gitlab-ce!19140
```
  4e257213
- Fix typo in Pipelines empty state view · 10350c2e
  Mark Fletcher authored May 25, 2018
  
  10350c2e
- Merge branch 'ce-to-ee-2018-05-25' into 'master' · 191e25f8
  Marin Jankovski authored May 25, 2018
```
CE upstream - 2018-05-25 09:26 UTC

Closes charts/gitlab#390

See merge request gitlab-org/gitlab-ee!5847
```
  191e25f8
- Merge branch '44579-ide-add-pipeline-to-status-bar' into 'master' · d6a7a111
  Phil Hughes authored May 25, 2018
```
Resolve "Show CI pipeline status in Web IDE"

Closes #44579

See merge request gitlab-org/gitlab-ce!19048
```
  d6a7a111
- Resolve "Show CI pipeline status in Web IDE" · c5389054
  André Luís authored May 25, 2018
  
  c5389054
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-25 · 3bf055b7
  GitLab Bot authored May 25, 2018
  
  3bf055b7
- Merge branch 'ce-to-ee-2018-05-24' into 'master' · 6013ef63
  Grzegorz Bizon authored May 25, 2018
```
CE upstream - 2018-05-24 18:26 UTC

See merge request gitlab-org/gitlab-ee!5842
```
  6013ef63
- Resolve conflicts doc/api/merge_requests.md · 138fd814
  Mark Fletcher authored May 25, 2018
  
  138fd814
- Resolve conflicts doc/api/issues.md · 54ad7ee7
  Mark Fletcher authored May 25, 2018
  
  54ad7ee7
- Remove dead link to Google Drive · b856baab
  Brendan O'Leary 🐢 authored May 25, 2018
  
  b856baab
24 May, 2018 4 commits
- Merge branch 'sh-add-pgbouncer-exporter-docs' into 'master' · 3d2e355d
  Achilleas Pipinellis authored May 24, 2018
```
Add docs on PgBouncer exporter

See merge request gitlab-org/gitlab-ee!5556
```
  3d2e355d
- Add docs on PgBouncer exporter · fa69a4fd
  Stan Hu authored May 24, 2018
  
  fa69a4fd
- Merge branch 'sh-disable-background-metrics-in-tests' into 'master' · de12348e
  Robert Speicher authored May 24, 2018
```
Disable the background Prometheus sampler in tests

See merge request gitlab-org/gitlab-ce!19130
```
  de12348e
- Merge branch 'migrate-restore-repo-to-gitaly' into 'master' · ba58a66a
  Douwe Maan authored May 24, 2018
```
Use gitaly repository_service.CreateRepositoryFromBundle to restore (rake task)

Closes charts/gitlab#390

See merge request gitlab-org/gitlab-ce!18644
```
  ba58a66a