Resolve "Geo: undefined method `pending_delete?' for nil:NilClass in geo/repository_verification/secondary/single_worker.rb"

Closes #5751

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

CE upstream - 2018-04-24 12:36 UTC

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

Add copy_metadata quick action

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

EE Port of "Add some way to mock and spy on default ES modules"

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

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18497

# Conflicts:
#	app/controllers/ldap/omniauth_callbacks_controller.rb
#	config/routes/user.rb
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	lib/gitlab/auth/ldap/user.rb
#	lib/gitlab/auth/saml/user.rb

[ci skip]

Fix unassign slash command preview

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

[EE] Fix unassign slash command preview

Closes #4950

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

Merge branch '43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries"

Closes #43111

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

Show Runner's description on job's page

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

Introduce new ProjectCiCdSettings model with group_runners_enabled

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

HA Application Servers should have nginx running on them.

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

Improve documentation of SSRF protection

Closes #45057

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

Refactor OmniauthCallbacksController to remove duplication

Closes #26559

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

[EE] Refactor OmniauthCallbacksController to remove duplication

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

Warning when restore fails when data-dir is a moint point

Closes #19309

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

CE upstream - 2018-04-23 21:23 UTC

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

Added fuzzy file finder to web IDE

Closes #44841

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

Bump lograge to 0.10.0 and remove monkey patch

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

Replace find file project spinach tests with RSpec

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

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

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

[Backport] EE's Burndown chart for group milestone common code

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

Expose Deploy Token info as environment variables to CI/CD jobs

Closes #44447

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

EE Port for: 'Expose Deploy Token info as environment variables to CI/CD jobs'

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

Fix users not seeing labels from private groups when being a member of a child project

Closes #45463

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

Fix docs typo in Validate the .gitlab-ci.yml

Closes #45688

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