* master: (73 commits)
  Add a lint check to restrict use of Rugged, EE version
  Fix EE offenses to the RSpec/SingleLineHook cop
  Update qa.rb
  Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
  Use a fixed remote name for Geo mirrors
  Use flash message instead of regular text block
  Update common.rb
  Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again
  Move EE-specific migrations under ee/db/
  Fix the EE assets paths and precompile config
  Add modal for deleting a milestone
  Make Gitlab::Git::Repository#run_git private
  Resolve conflicts in app/assets/javascripts/dispatcher.js
  Resolve conflicts in app/assets/javascripts/dispatcher.js
  Resolve conflicts in lib/gitlab/git/repository.rb
  Resolve conflict in spec/services/issues/move_service_spec.rb
  Resolve conflict in features/support/db_cleaner.rb
  Resolve conflict in spec/support/db_cleaner.rb
  Resolve conflict with .gitlab-ci.yml
  Update secret_values to support dynamic elements within parent
  ...

Add a lint check to restrict use of Rugged, EE version

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

Geo: Improve replication status. Using pg_stat_wal_receiver

Closes #3256

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

Make Gitlab::Git::Repository#run_git private, EE version

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

Add Epic information for selected issue in Issue boards sidebar

Closes #4289

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

Update secret_values to support dynamic elements within parent -- EE merge edition

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

[EE]  Resolve "Re-enable the `RSpec/SingleLineHook` cop"

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

Move EE-specific migrations under ee/db/

Closes #3094

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

Geo project replication QA

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve "Asset was not declared to be precompiled in production, favicon-green.ico"

Closes #4666

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

Resolve "High rate of config.lock file errors on Geo testbed"

Closes #4693

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

CE upstream - Wednesday

Closes gitaly#921 and gitaly#929

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

Add changelog

Add modal for deleting a milestone (EE port)

Closes gitlab-ce#41314

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

This reverts commit 9f5390d8, reversing
changes made to c28ffa1d.

* master: (135 commits)
  Merge branch '42361-workaround' into 'master'
  Update CHANGELOG.md for 10.4.1
  Update CHANGELOG-EE.md for 10.4.1-ee
  Add details on how to disable GitLab to the DR documentation
  Avoid array indices to fixtures in JS specs
  Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
  Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
  Fix a bug in spec/ee/spec/lib/gitlab/geo/file_transfer_spec.rb
  updating geo docs to show Geo HA as GA in 10.4
  Add CHANGELOG
  Fix OPENSSH_EXPECTED_COMMAND in the geo:check rake task
  Moves more mr widget components into vue files Adds i18n Adds better test coverage
  [EE] Remove one Spinach job and add one RSpec job
  Use limit for search count queries
  Execute group hooks after-commit when moving an issue
  Geo: sync .gitattributes to info/attributes in secondary nodes
  Add changelog entry
  Update tests to handle swapping of items
  Fix issue reordering for swapping of items
  EE port of groups-webpack-bundle
  ...

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Adds correct illustration for pending state

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

 Conflicts:
   qa/qa.rb

(cherry picked from commit b8506500)

CI/CD end-to-end tests / EE

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

Conflicts:
  qa/qa.rb

Moves more mr widget components into vue files

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

Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb"

Closes #42361

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

[ci skip]

[ci skip]