Merge branch 'sh-geo-add-project-deletion-events' of gitlab.com:gitlab-org/gitlab-ee into sh-geo-add-project-deletion-events

Resolve "Can't sort Groups"

See merge request !2156

CE upstream

Closes gitlab-ce#33877, gitlab-ce#33594, gitlab-ce#33598, and gitlab-ce#27070

See merge request !2178

Remove left margin for stages with downstream and only one job

Closes #2714

See merge request !2221

Geo: fix removal of repositories from disk on secondary nodes

Closes #2701

See merge request !2210

Fix linking to line number on parallel diff creating empty discussion -- EE merge edition

Closes gitlab-ce#34010

See merge request !2207

Merge branch '33489-rename-settings-panel-close-action-to-collapse-to-avoid-confusion-ee' into 'master'

Port Resolve "Rename settings panel "close" action to "collapse" to avoid confusion" to EE

See merge request !2096

Move Elasticsearch indexer into run_after_commit

Closes #2712

See merge request !2214

Elasticsearch queries should retry on failure

Closes #2681

See merge request !2181

Change title of Code quality docs

See merge request !2204

Geo config - Move "regenerate authorized keys" step (step 6) of config to before step 4

See merge request !2218

Details:

    modified:   spec/features/help_pages_spec.rb
    deleted:    spec/features/milestones/milestones_spec.rb

Link to instructions on how to build a custom OpenSSH package

See merge request !2206

Normalise license MD5 values

See merge request !2205

Closes #2712

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010

Conflicts:
	spec/javascripts/fixtures/merge_requests.rb
	spec/javascripts/merge_request_notes_spec.js