Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js

[ci skip]

Make Gitaly RepositoryExists opt-out

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

Look at system notes created just before merge as well as after, when deciding if an MR can be reverted

Closes #42377

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

Add note within ux documentation that further changes should be made within the…

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

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

Default to HTTPS for all Gravatar URLs

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

Generate ssh key on the fly for QA

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

Moves status icon into a vue file and adds tests

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

Add modal for deleting a milestone (EE port)

Closes gitlab-ce#41314

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

Add modal for deleting a milestone

Closes #41314

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

Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"

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

On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds,
while `MergeRequest::Metrics#merged_at` does. This breaks the optimization
assumption that we only need to search for notes created *after* the MR has
been merged.

Unsynchronized system clocks also make this a dangerous assumption to make.

Adding a minute of leeway still optimizes away most notes, but allows both
cases to be handled more gracefully. If the system clocks are more than a
minute out, we'll still be broken, of course.

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

Revert "Merge branch 'remove-rugged-walk' into 'master'"

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

This reverts merge request !16626

Can parse root .gitattributes file for a ref

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

Resolve "generalise not found status icon color throughout application"

Closes #42285

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

Resolve "Add empty state for pending job"

Closes #42220

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

Adds correct illustration for pending state

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

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

(cherry picked from commit b8506500)

* master: (30 commits)
  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
  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
  Migrate repository bundling to Gitaly
  Use limit for search count queries
  Fix offense in runners settings QA page object class
  Wait for runner until it registers itself in QA tests
  Fix static-analysis offenses in QA support class
  Add specific views / selectors for QA runners page
  Add views / selectors for pipeline show page object
  ...

This reverts merge request !16525

CI/CD end-to-end tests

Closes gitlab-qa#18

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

CI/CD end-to-end tests / EE

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

Link Auto DevOps settings to Clusters page

Closes #42053

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

Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master'

Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT"

Closes #42161

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

Conflicts:
  qa/qa.rb

If using gravatar.com, both plain_url and ssl_url in settings are now
served via HTTPS. Make this the default.

Moves more mr widget components into vue files

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