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

Resolve "Icons for approvals remaining and approvals met"

Closes #4133

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

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

Update LICENSE to clean up formatting

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

Include the Namespace Id in purchase link for GL.com plans

Closes gitlab-com/customers-gitlab-com#227

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

Resolve "Add wiki total/synced/failed to prometheus metrics"

Closes #4414

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

CE upstream - Saturday

Closes gitlab-ce#36970 and gitlab-qa#122

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

Adjust content width for User Settings, Pipeline quota

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

[ci skip]

[ci skip]

* qa-add-deploy-key:
  Use heredoc so it's more clear
  Put all menus under menu module
  Introduce common project settings and just put
  Introduce Factory::Resource::DeployKey
  Introduce expand_deploy_keys
  Introduce Menu::Side
  Just add a new class to locate the expand button
  Update descriptions and names based on feedback
  Rename DeployKey to DeployKeys
  QA: Add a scenario for adding a deploy key

Port of 40780-choose-file to EE

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

This will automatically select the respective User or Group in the
purchase form used in the subscription portal.

Correct GitLab Slack Application example on landing page

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

Correct add_to_slack_data docs_path for gitlab slack application landing

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

Port of 38869-milestone-select to EE

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

Make scoped issue board specs more reliable

Closes #4440

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

[ci skip]