Commits · c7d8de4bb00609d6bdb29678a5521fd404fe65e3 · nexedi / gitlab-ce

23 Apr, 2018 40 commits
- 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
- Merge branch 'ee-44713-fast-spec-helper' into 'master' · 048d388f
  Douwe Maan authored Apr 23, 2018
```
[EE] Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

See merge request gitlab-org/gitlab-ee!5180
```
  048d388f
- Merge branch '44713-fast-spec-helper' into 'master' · 1f062ee0
  Douwe Maan authored Apr 23, 2018
```
Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

Closes #44713

See merge request gitlab-org/gitlab-ce!18074
```
  1f062ee0
- Merge branch 'ce-to-ee-2018-04-23' into 'master' · f2135520
  Dmitriy Zaporozhets authored Apr 23, 2018
```
CE upstream - 2018-04-23 12:26 UTC

Closes gitaly#1113

See merge request gitlab-org/gitlab-ee!5451
```
  f2135520
- Merge branch 'missing-note-on-p1' into 'master' · 38b35076
  Mek Stittri authored Apr 23, 2018
```
Added missing note for P1 priority and updated links

See merge request gitlab-org/gitlab-ce!18491
```
  38b35076
- Merge branch 'patch-19' into 'master' · 97b83b2a
  Rémy Coutable authored Apr 23, 2018
```
fix revoke header on deploy token docs

See merge request gitlab-org/gitlab-ce!18527
```
  97b83b2a
- Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb · 2afe3a12
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2afe3a12
- Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb · c78e2ff9
  Rémy Coutable authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c78e2ff9
- Fix conflict in app/finders/users_finder.rb · c8112f99
  Dmitriy Zaporozhets authored Apr 23, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c8112f99
- Resolve conflicts for app/assets/javascripts/vue_shared/components/ci_icon.vue · cf11a9e7
  Filipa Lacerda authored Apr 23, 2018
  
  cf11a9e7
- Merge branch 'ee-33697-remove-ujs-action-big-graph' into 'master' · 987324f6
  Phil Hughes authored Apr 23, 2018
```
Remove UJS actions from pipeline graph

See merge request gitlab-org/gitlab-ee!5450
```
  987324f6