# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/dispatcher.js
#	doc/user/project/clusters/index.md

[ci skip]

Add note about live_debug only working on javascript enabled specs

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

Backport for Resolve "change status icon for reports when fails to be found or cannot load"

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

Archive changelogs for versions before 8.16

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

Resolve "change status icon for reports when fails to be found or cannot load"

Closes #4316

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

Resolve "Move EE-specific tasks to `ee/lib/tasks` directory"

Closes #4637

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

CE upstream - Monday

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

Resolve ""This job has not been triggered yet"  after hitting "Retry""

Closes #42119

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

Fix visually broken admin dashboard

Closes #4566

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

* ee/master: (21 commits)
  Update Geo doc to restart PostgreSQL to changes take effect on secondary
  Move to EE section because it is no longer used in CE
  Update CHANGELOG.md for 10.3.6
  Update CHANGELOG-EE.md for 10.3.6-ee
  Remove left over test data before running tests
  Fix route for Geo 'Repair authentication'
  Add docs for playing a CI pipeline schedule
  Adds logging to remove remote worker
  Update CHANGELOG.md for 10.4.0
  Update CHANGELOG-EE.md for 10.4.0-ee
  Copy k8s service integration info into clusters
  Adds ExclusiveLeaseGuard to RepositoryRemoveRemoteWorker and restores RemoteMirror#refresh_remote to after_save callback
  Moves ExclusiveLeaseGuard from EE to CE
  Moves remove_remote to a background job
  Fix callback alignments
  refactor for projects-r*, s* (EE)
  Update icon to match EE
  Merge branch 'master' into vue-mr-widget-state
  Move mr_widget_auto_merge_failed component into a vue file
  Move EE-specific image to ee/app/assets/images
  ...

Update Geo docs to restart PostgreSQL to changes take effect on secondary

Closes #4663

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

Remove left over test data before running tests

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

Resolve "Cannot change project visibility from Private (even when owner)"

Closes #40612

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

Move UserCallout reference to EE section because it is no longer used in CE

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

Fix callback alignments

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

Fix callback alignments

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

Until a license is added GitLab EE, the admin dashboard is visually
broken because of an incorrect container size.

Fix eslint - UserCallout reference

Closes #42298

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

Use has_table_privilege for TRIGGER on PostgreSQL

Closes #38634

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

[ci skip]

[ci skip]

[ci skip]

Update CHANGELOG.md

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

Add Gitlab::Profiler for profiling from a console or runner

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

refactor for projects-r*, s* (EE)

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

refactor for projects-r*, s*

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

Fix Error 500 when repository has no avatar

Closes #42249

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

* master:
  Fix route for Geo 'Repair authentication'
  Add docs for playing a CI pipeline schedule
  Adds logging to remove remote worker
  Update CHANGELOG.md for 10.4.0
  Update CHANGELOG-EE.md for 10.4.0-ee
  Copy k8s service integration info into clusters
  Add more info on how DAST works
  Adds ExclusiveLeaseGuard to RepositoryRemoveRemoteWorker and restores RemoteMirror#refresh_remote to after_save callback
  Moves ExclusiveLeaseGuard from EE to CE
  Moves remove_remote to a background job
  Update icon to match EE
  Merge branch 'master' into vue-mr-widget-state
  Move mr_widget_auto_merge_failed component into a vue file
  Move EE-specific image to ee/app/assets/images
  Move EE-specific stylesheets to ee/app/assets/stylesheets

Loading spinner not stop even on errors in the Issuable Templates

Closes #40029

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