# Conflicts:
#	.flayignore
#	app/assets/javascripts/main.js
#	app/controllers/projects/mirrors_controller.rb
#	app/controllers/projects/settings/repository_controller.rb
#	app/models/project.rb
#	app/models/remote_mirror.rb
#	app/serializers/project_mirror_entity.rb
#	app/services/concerns/exclusive_lease_guard.rb
#	app/views/admin/application_settings/_repository_mirrors_form.html.haml
#	app/views/admin/application_settings/show.html.haml
#	app/views/projects/settings/repository/show.html.haml
#	app/workers/all_queues.yml
#	config/routes/group.rb
#	config/routes/project.rb
#	config/sidekiq_queues.yml
#	config/webpack.config.js
#	db/migrate/20180503131624_create_remote_mirrors.rb
#	db/migrate/20180503141722_add_remote_mirror_available_overridden_to_projects.rb
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb
#	db/migrate/20180503193953_add_mirror_available_to_application_settings.rb
#	db/schema.rb
#	doc/workflow/repository_mirroring.md
#	lib/gitlab/ci/pipeline/chain/command.rb
#	lib/gitlab/import_export/import_export.yml
#	lib/gitlab/usage_data.rb
#	package.json
#	spec/factories/projects.rb
#	spec/javascripts/vue_mr_widget/mock_data.js
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/lib/gitlab/usage_data_spec.rb
#	spec/models/project_spec.rb
#	spec/models/remote_mirror_spec.rb
#	spec/models/repository_spec.rb
#	spec/services/ci/retry_build_service_spec.rb
#	spec/spec_helper.rb

[ci skip]

Merge branch '5794-we-should-failover-gracefully-when-we-can-t-connect-to-geo-tracking-database-ce' into 'master'

Backport: Keep ShaAttribute from halting startup when we can’t connect to a database

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

Merge branch '5794-we-should-failover-gracefully-when-we-can-t-connect-to-geo-tracking-database' into 'master'

Keep ShaAttribute from halting startup when we can’t connect to Geo tracking database

Closes #5794

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

Merge new CE remote_mirror migrations into EE, and disable ones that are already in EE

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

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

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

chore(docs): change json response field name from project_access to access_level

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

Fix spec for Geo::RepositoryVerification::Primary::SingleWorker

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

Fix project factory `import_*` traits

Closes gitlab-ee#5904

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

[EE] Fix project factory `import_*` traits

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

Resolve "Display merge commit SHA in merge widget after merge"

Closes #43557

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

Resolve "Monitoring graphs - Popover value improvements"

Closes #41783 and gitlab-ee#5573

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

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

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

Backport 5480-epic-notifications from EE

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

Resolve "Email notifications for epics"

Closes #5480

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

Upgrade to Webpack 4

Closes #43400

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

Upgrade to Webpack 4

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

Fix close keyboard shortcuts dialog using the keyboard shortcut

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