[skip-ci]

# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/dispatcher.js
#	app/assets/stylesheets/framework/dropdowns.scss
#	app/assets/stylesheets/pages/issues.scss
#	app/assets/stylesheets/pages/projects.scss
#	app/helpers/appearances_helper.rb
#	app/models/ci/build.rb
#	app/services/boards/issues/list_service.rb
#	app/uploaders/job_artifact_uploader.rb
#	app/uploaders/legacy_artifact_uploader.rb
#	app/workers/post_receive.rb
#	app/workers/project_cache_worker.rb
#	doc/user/permissions.md
#	doc/user/project/merge_requests/index.md
#	lib/gitlab/sidekiq_config.rb
#	locale/gitlab.pot
#	spec/factories/appearances.rb
#	spec/factories/ci/job_artifacts.rb
#	spec/lib/gitlab/email/handler_spec.rb
#	spec/lib/gitlab/sidekiq_config_spec.rb
#	spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
#	spec/models/ci/build_spec.rb
#	spec/models/project_spec.rb
#	spec/serializers/pipeline_serializer_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb
#	spec/uploaders/legacy_artifact_uploader_spec.rb

[ci skip]

[CE-Backport] Fix board filter when milestone is predefined

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

Downgrade the grpc gem to 1.4.5

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

Downgrade the grpc gem to 1.4.5

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

Move git operations for squash and rebase into Gitlab::Git

Closes gitaly#761

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

Add board scope highlight

Closes #4067

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

Backport board scope highlight

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

CE upstream - Tuesday

Closes gitaly#737

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

Add pre-create directory commands to geo doc for DB replication

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

Port of 38869-templates to EE

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

Export template selector as ES6 modules

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

Generalize detail page headers (Issues, Merge Requests, Snippets)

Closes #40543

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

List multiple clusters

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

Make sure head pippeline always corresponds with an MR

Closes #37354

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

Remove SSH repository sync support from Geo

Closes #3891

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

Resolve "SSH warning message appears in clone box"

Closes #40850

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

backport CE style for boards selector fade mask

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

Merge branch '3181-no-clues-to-indicate-the-list-in-go-to-board-dropdown-is-scrollable' into 'master'

Resolve "No clues to indicate the list in Go to board dropdown is scrollable"

Closes #3181

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

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40543
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15192

Migrate Gitlab::Git::Repository#revert to Gitaly

Closes gitaly#780

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

Docs: Update permissions

Closes #40143

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

Docs: update permissions

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

Port Gitlab::Git::Repository#cherry_pick migration to EE

Closes gitaly#737

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