Commits · b80c75517915237f6a030fe045be4e19939ed4b4 · nexedi / gitlab-ce

24 Apr, 2018 9 commits
- EE Port of "Add some way to mock and spy on default ES modules" · b80c7551
  Mike Greiling authored Apr 24, 2018
  
  b80c7551
- Merge branch '4950-unassign-slash-command-preview-fix' into 'master' · 4b542c17
  Sean McGivern authored Apr 24, 2018
```
[EE] Fix unassign slash command preview

Closes #4950

See merge request gitlab-org/gitlab-ee!5334
```
  4b542c17
- [EE] Fix unassign slash command preview · 8bb15838
  Athar Hameed authored Apr 24, 2018
  
  8bb15838
- Merge branch 'lm-update-ha-app-server-config' into 'master' · 687f5788
  Marin Jankovski authored Apr 24, 2018
```
HA Application Servers should have nginx running on them.

See merge request gitlab-org/gitlab-ee!5427
```
  687f5788
- Merge branch 'ee-jej/refactor-omniauth-controller' into 'master' · 8e0fe6a4
  Douwe Maan authored Apr 24, 2018
```
[EE] Refactor OmniauthCallbacksController to remove duplication

See merge request gitlab-org/gitlab-ee!5416
```
  8e0fe6a4
- Merge branch 'ce-to-ee-2018-04-23' into 'master' · eda46572
  Rémy Coutable authored Apr 24, 2018
```
CE upstream - 2018-04-23 21:23 UTC

See merge request gitlab-org/gitlab-ee!5457
```
  eda46572
- Resolve conflict in spec/factories/namespaces.rb · 1133b322
  Rémy Coutable authored Apr 24, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1133b322
- Resolve conflict in app/models/concerns/routable.rb · 898e3496
  Rémy Coutable authored Apr 24, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  898e3496
- Merge branch 'ee-44447-expose-deploy-token-to-ci-cd' into 'master' · dc62ac84
  Grzegorz Bizon authored Apr 24, 2018
```
EE Port for: 'Expose Deploy Token info as environment variables to CI/CD jobs'

See merge request gitlab-org/gitlab-ee!5424
```
  dc62ac84
23 Apr, 2018 31 commits
- Fix CHANGELOG conflicts · ad0aa828
  Mayra Cabrera authored Apr 23, 2018
  
  ad0aa828
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-23 · c7d8de4b
  GitLab Bot authored Apr 23, 2018
```
# Conflicts:
#	CHANGELOG.md
#	app/models/concerns/routable.rb
#	spec/factories/namespaces.rb

[ci skip]
```
  c7d8de4b
- Merge branch '5735-follow-up-from-resolve-document-background-verification-docs' into 'master' · fc02fb3a
  Stan Hu authored Apr 23, 2018
```
Resolve "Follow-up from "Resolve "Document background verification"""

Closes #5735

See merge request gitlab-org/gitlab-ee!5442
```
  fc02fb3a
- Merge branch 'mk/add-capybara-debugging-methods-to-docs' into 'master' · 54b97f9c
  Stan Hu authored Apr 23, 2018
```
Add Capybara debugging methods to docs

See merge request gitlab-org/gitlab-ce!18549
```
  54b97f9c
- Add Capybara debugging methods to docs · 407a8004
  Michael Kozono authored Apr 23, 2018
  
  407a8004
- Update CHANGELOG.md for 10.7.1 · c4ccd776
  Mayra Cabrera authored Apr 23, 2018
```
[ci skip]
```
  c4ccd776
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 3569294e
  Mayra Cabrera authored Apr 23, 2018
  
  3569294e
- Update CHANGELOG.md for 10.7.1 · f3e0c08b
  Mayra Cabrera authored Apr 23, 2018
```
[ci skip]
```
  f3e0c08b
- Update CHANGELOG-EE.md for 10.7.1-ee · 6da64cb7
  Mayra Cabrera authored Apr 23, 2018
```
[ci skip]
```
  6da64cb7
- Merge branch 'ce-to-ee-2018-04-23' into 'master' · 8e1f50f9
  Stan Hu authored Apr 23, 2018
```
CE upstream - 2018-04-23 15:27 UTC

See merge request gitlab-org/gitlab-ee!5454
```
  8e1f50f9
- Merge branch 'update-doorkeeper-changelog' into 'master' · e9b8fb43
  Stan Hu authored Apr 23, 2018
```
Add changelog entry for updating doorkeeper

See merge request gitlab-org/gitlab-ce!18550
```
  e9b8fb43
- Merge branch 'sh-geo-dr-background-verf-docs' into 'master' · 2e5bc82f
  Stan Hu authored Apr 23, 2018
```
Fix missing Markdown link in background verification docs

See merge request gitlab-org/gitlab-ee!5445
```
  2e5bc82f
- Merge branch '45666-project-ci-lint-links' into 'master' · 81e80ae9
  Kamil Trzciński authored Apr 23, 2018
```
Update links to /ci/lint with a new project's ci/lint

Closes #45666

See merge request gitlab-org/gitlab-ce!18539
```
  81e80ae9
- Add missing changelog entry · aa15cada
  Lin Jen-Shin authored Apr 24, 2018
  
  aa15cada
- Merge branch '44775-avatar-on-os-fails-with-cdn' into 'master' · cc0b4e3c
  John Northrup authored Apr 23, 2018
```
Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"

Closes #44775

See merge request gitlab-org/gitlab-ce!18092
```
  cc0b4e3c
- Resolve "Avatar URLs are wrong when using a CDN path and Object Storage" · 741f333d
  Micaël Bergeron authored Apr 23, 2018
  
  741f333d
- Merge branch '45433-upgrade-doorkeeper' into 'master' · c0eabb84
  Marin Jankovski authored Apr 23, 2018
```
Update doorkeeper

Closes #45433 and #45647

See merge request gitlab-org/gitlab-ce!18543
```
  c0eabb84
- Resolve conflict in spec/support/helpers/stub_configuration.rb · 491acf3b
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  491acf3b
- Resolve conflict in spec/spec_helper.rb · d8e41083
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d8e41083
- Resolve conflict in lib/settings.rb · 84825b39
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  84825b39
- Resolve conflict in lib/gitlab.rb · 8928d85c
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8928d85c
- Fix conflict for app/assets/javascripts/pipelines/components/graph/stage_column_component.vue · 578689de
  Filipa Lacerda authored Apr 23, 2018
  
  578689de
- Fix conflict for app/assets/javascripts/pipelines/components/graph/graph_component.vue · f45545ed
  Filipa Lacerda authored Apr 23, 2018
  
  f45545ed
- Update doorkeeper for: · a103cbbe
  Lin Jen-Shin authored Apr 23, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/issues/45433
and
https://github.com/doorkeeper-gem/doorkeeper/issues/1065
```
  a103cbbe
- Update links to /ci/lint with ones to project ci/lint · ee274f89
  Takuya Noguchi authored Apr 23, 2018
  
  ee274f89
- Merge branch '42936-improve-ns-factory-avoid-duplicates-ee' into 'master' · a264524a
  Nick Thomas authored Apr 23, 2018
```
EE: Make sure we're not creating duplicated namespace

See merge request gitlab-org/gitlab-ee!5410
```
  a264524a
- Merge branch '42936-improve-ns-factory-avoid-duplicates' into 'master' · 2e00c1a7
  Nick Thomas authored Apr 23, 2018
```
Resolve "Namespace factory is problematic"

Closes #42936

See merge request gitlab-org/gitlab-ce!18464
```
  2e00c1a7
- EE: Make sure we're not creating duplicated namespace · 471457d4
  Lin Jen-Shin authored Apr 23, 2018
  
  471457d4
- Resolve "Namespace factory is problematic" · ab286656
  Lin Jen-Shin authored Apr 23, 2018
  
  ab286656
- Merge branch '45635-repository-storages-documentation-url-moved' into 'master' · 3d12ce95
  Nick Thomas authored Apr 23, 2018
```
Resolve "Repository storages documentation URL moved"

Closes #45635

See merge request gitlab-org/gitlab-ce!18529
```
  3d12ce95
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-23 · 60f0764e
  GitLab Bot authored Apr 23, 2018
```
# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	lib/gitlab.rb
#	lib/settings.rb
#	spec/spec_helper.rb
#	spec/support/helpers/stub_configuration.rb

[ci skip]
```
  60f0764e