# Conflicts:
#	db/schema.rb

Fix a bug where branch could not be delete due to a push rule config

Closes #4078

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

Move git operations for UpdateRemoteMirrorService into Gitlab::Git

Closes gitaly#841

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

Prepare Gitlab::Git::Repository#rebase for Gitaly migration

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

Geo backend changes for Vue admin page

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

Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json

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

More descriptive error when clocks between Geo nodes are out of sync

Closes #4276

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

Add step to run gitlab:geo:check on primary

Closes #4088

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

Port of da-handle-hashed-storage-repos-using-repo-import-task to EE

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

In case there is a large difference between the system clocks of
different Geo nodes (> 60 seconds) the JWToken won't be valid. Make
this error more descriptive so sysadmins can identify the problem.

Closes gitlab-org/gitlab-ee#4276

Allow sidekiq to react to becoming a Geo primary or secondary without a restart

Closes #4048

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

Switch some bundles to use Axios --  EE merge edition

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

Push Rule for branch name should be ignored when deleting a branch
otherwise deleting some existing branches will not be possible.

Resolve "Icons for approvals remaining and approvals met"

Closes #4133

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

- Add current attribute to GeoNode entity
- Add missing_oauth_application to GeoNodeStatus entity

Related to gitlab-org/gitlab-ee#4268

EE Port of Multif File Editor File Icons

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

EE: QA: Add a scenario for adding a deploy key

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

Conflicts:
	app/assets/javascripts/boards/boards_bundle.js
	app/assets/javascripts/boards/services/board_service.js
	spec/javascripts/boards/mock_data.js

Before:
/-/boards/1/issues.json?page=1&per=50&scope=all&utf8=✓&state=opened&milestone_title=#upcoming

After:
 /-/boards/1/issues.json?page=1&per=50&scope=all&utf8=%E2%9C%93&state=opened&milestone_title=%23upcoming

Merge remote-tracking branch 'origin/master' into 4133-icons-for-approvals-remaining-and-approvals-met