# Conflicts:
#	doc/user/project/quick_actions.md
#	spec/factories/projects.rb
#	spec/models/project_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

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

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

Add copy_metadata quick action

Closes #38450

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

Add copy_metadata quick action

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

Fix errors on pushing/editing files on empty repositories

Closes #44618 and #42583

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

Add documentation for externally hosted LFS objects

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

Resolve "Add some way to mock and spy on default ES modules"

Closes #30998

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

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

Hide the push to master instructions for users that are not allowed to
do that.

Also hide buttons that would direct them to commit directly in master

API can be used by project owners to disable LFS object verification
that will block pushes that contain LFS pointers but no the objects.

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