CE upstream - 2018-04-25 09:26 UTC

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

Backport dev env check for storage settings deprecation

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

Avoid noisy deprecation warnings on test env

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

Replace the `admin/license.feature` spinach test with an rspec analog

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

Do not preload settings

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

Resolve "Burndown chart for group milestone"

Closes #3064

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

CE upstream - 2018-04-24 15:49 UTC

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

Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

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

Mock Pager in Karma tests

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

The behavior was moved to ApplicationSetting#should_check_namespace_plan? in order to it keep being tested on test environments without needing a explicit stub

Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

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

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

Broken link fix

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

# 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