Prevents maintainer edit to render a blank div
Properly names sha mismatch component

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

Closes gitlab-ce#39968

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

Skip adding column to remote_mirrors that could already exist

Closes gitlab-qa#238

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

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

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

Group SAML skips forgery protection in production

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

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

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

Replace the `project/issues/references.feature` spinach test with an rspec analog

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

Replace the `project/deploy_keys.feature` spinach test with an rspec analog

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

Merge branch '5957-geo-secondary-can-t-log-failed-sign-in-attempts-due-to-read-only-db' into 'master'

Resolve "Geo: Secondary can't log failed sign-in attempts due to read-only DB"

Closes #5957

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

Adding the :prometheus tag to an rspec test will clear out
memory-mapped files and reset the registry.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968

refactor 'cycle_analytics' to use axios

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

Epics - include ::Issuable, not EE::Issuable

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

Add Repository#xcode_project? method

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

# Conflicts:
#	db/schema.rb

[ci skip]

Instead of iterating over each delta we use the same mechanism from the
Max File Size push rule.

refactor "deploy_keys" to use axios

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

Fix project mirror data schema

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

Removed the d3_rails gem

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

# Conflicts:
#   db/schema.rb