Conflicts:
	db/schema.rb

34768 Fix problem with issuable header wrapping when content is too long

Closes #34768

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

Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled

Closes #20666

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

Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform

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

Add all InfluxDB metrics to prometheus

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

Fixup rspec tag misuse

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

The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now
hidden when issues are disabled on the project.

Fix md form tab double click toggle

Closes #39624

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

Resolve "GPG tooltips not working in Safari"

Closes #38385

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

Merge branch 'add-ingress-to-cluster-applications' of gitlab.com:gitlab-org/gitlab-ce into add-ingress-to-cluster-applications

Add applications section to GKE clusters page

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

Enable BorderZero rule in scss-lint

Closes #39757

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

In !14818 we added the ability to specify the example groups that should
run via the `-t` (tag) option to rspec.  It was assumed that the
inclusion filter generated `{:core => true, :mattermost => true}` would
run examples tagged :core OR :mattermost, when instead it means :core
AND :mattermost.

Here in order to assure at least some tests run, we specify that
the :mattermost tagged examples are the only ones we care about.

Resolve "Internationalize tags page"

Closes #38589

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

removed the #ensure_ref_fetched from all controllers

Closes #36061

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

Revert unintentional changes in !12810

Closes #39816

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

Make Prometheus metrics endpoint return empty response when metrics are disabled

Closes #35639

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

Resolve "DashboardController#activity.json is slow due to SQL"

Closes #27375

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

Add reconfigure docs to CE

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

Conflicts:
	app/assets/javascripts/clusters/clusters_bundle.js
	app/assets/javascripts/clusters/components/application_row.vue
	app/assets/javascripts/clusters/services/clusters_service.js

Prevent git push when LFS objects are missing

Closes #24564

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