* upstream/master: (136 commits)
  Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
  Add modal for deleting a milestone
  Revert "Merge branch 'remove-rugged-walk' into 'master'"
  Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"
  Update CHANGELOG.md for 10.4.1
  Add a gRPC health check to ensure Gitaly is up
  Add formatted_data attribute to Git::WikiPage
  Avoid array indices to fixtures in JS specs
  Migrate .batch_lfs_pointers to Gitaly
  Updates `Revert this merge request` text
  Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
  Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
  Workaround a recaptcha pop-up that cannot be tested
  Uses sprite icon to render verified commit badge and uniforms css colors
  Moves more mr widget components into vue files Adds i18n Adds better test coverage
  Execute system hooks after-commit when executing project hooks
  Remove one Spinach job and add one RSpec job
  Remove callback as we already update accordingly on services
  Fix typo in `.gitlab-ci.yml` heading
  Migrate repository bundling to Gitaly
  ...