CE upstream - 2018-05-10 12:23 UTC

Closes charts/gitlab#396

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

Jira dev panel docs merge requests

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

Group burndown chart

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

This reverts commit 318812ff.

ShaAttribute crashes with ArgumentError if column doesn't exist

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

Update gon ~> 6.1.0 to ~> 6.2

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

Fix finding wiki pages when they have invalidly-encoded content

Closes #43715

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

Hide merge request option in IDE when merge requests are disabled

Closes #45698

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

Fix outdated web ide copy

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

Merge branch '41229-include-the-human-repo-name-in-gitlab-shell-log-when-hashed-storage-is-in-use' into 'master'

Resolve "Include the human repo name in gitlab-shell.log when hashed storage is in use"

Closes #41229

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

Support resetting of Prometheus metrics between test runs

Closes #39968

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

Support resetting of Prometheus metrics between test runs (EE port)

Closes gitlab-ce#39968

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

# Conflicts:
#	lib/gitlab/git/repository.rb

[ci skip]

Remove accidental EE additions in CE

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

Skip adding column to remote_mirrors that could already exist

Closes gitlab-qa#238

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

Improve fix for intermittent QA failure in "cloning code using a deploy key"

Closes charts/gitlab#396

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

CE upstream - 2018-05-10 09:24 UTC

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

Resolve "Update `updated_at` on an issue when label or time spent was added"

Closes #45442

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

[CE] Backport with_forgery_protection spec helper

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

Group SAML skips forgery protection in production

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

Backport some changes from gitlab-ee!5476

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

Improve performance of repository size check

Closes #5566

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

Resolve "NoMethodError: undefined method `uploader_context' for #<ObjectStorage::MigrateUploadsWorker::Upload:0x00007f59e..."

Closes #46147

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

CE upstream - 2018-05-10 06:30 UTC

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

This is especially helpful when hashed storage is enabled

CE upstream - 2018-05-09 18:24 UTC

Closes gitlab-development-kit#348

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

[CE Port] Replace the `project/deploy_keys.feature` spinach test with an rspec analog

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

Move include SafeMirrorParams to EE module

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