# Conflicts:
#	CHANGELOG.md
#	app/models/concerns/routable.rb
#	spec/factories/namespaces.rb

[ci skip]

Resolve "Follow-up from "Resolve "Document background verification"""

Closes #5735

See merge request gitlab-org/gitlab-ee!5442

Add Capybara debugging methods to docs

See merge request gitlab-org/gitlab-ce!18549

[ci skip]

[ci skip]

[ci skip]

CE upstream - 2018-04-23 15:27 UTC

See merge request gitlab-org/gitlab-ee!5454

Add changelog entry for updating doorkeeper

See merge request gitlab-org/gitlab-ce!18550

Fix missing Markdown link in background verification docs

See merge request gitlab-org/gitlab-ee!5445

Update links to /ci/lint with a new project's ci/lint

Closes #45666

See merge request gitlab-org/gitlab-ce!18539

Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"

Closes #44775

See merge request gitlab-org/gitlab-ce!18092

Update doorkeeper

Closes #45433 and #45647

See merge request gitlab-org/gitlab-ce!18543

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

https://gitlab.com/gitlab-org/gitlab-ce/issues/45433
and
https://github.com/doorkeeper-gem/doorkeeper/issues/1065

EE: Make sure we're not creating duplicated namespace

See merge request gitlab-org/gitlab-ee!5410

Resolve "Namespace factory is problematic"

Closes #42936

See merge request gitlab-org/gitlab-ce!18464

Resolve "Repository storages documentation URL moved"

Closes #45635

See merge request gitlab-org/gitlab-ce!18529

# 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]

[EE] Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

See merge request gitlab-org/gitlab-ee!5180

Resolve "Skip setup of gitlab-shell, gitaly, ... for specs that don't need it."

Closes #44713

See merge request gitlab-org/gitlab-ce!18074

CE upstream - 2018-04-23 12:26 UTC

Closes gitaly#1113

See merge request gitlab-org/gitlab-ee!5451

Added missing note for P1 priority and updated links

See merge request gitlab-org/gitlab-ce!18491

fix revoke header on deploy token docs

See merge request gitlab-org/gitlab-ce!18527

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>