# Conflicts:
#	app/assets/javascripts/sidebar/sidebar_bundle.js
#	app/views/shared/issuable/_nav.html.haml
#	lib/gitlab/git/repository.rb
#	spec/models/namespace_spec.rb

[ci skip]

CE upstream - Monday

Closes gitaly#802 and omnibus-gitlab#3006

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

Decrease the push mirror backoff delay and add rate limiting to the push mirror…

Closes #3832

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

Small Gitlab::Git fixes for Gitaly

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

Second iteration of Move Kubernetes from service to Cluster page

Closes #35616 and #39826

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

Cache the forks in a namespace in the RequestStore

Closes #40625

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

Backport Extract epic nav into separate partial for easier CE => EE

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

[CE] Move git operations for squash and rebase into Gitlab::Git

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

Clarify the docs review process and mention the supported repos

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

Improve Geo logging of repository errors

Closes #2968

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Refactor sidebar weight block to use Vue and be async + add to Issue Boards

Closes #1379

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

Backport EE changes from refactor sidebar weight block Vue and move to Issue Boards

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

remove ambiguity about which resource type to be using for new sessions

Closes #39367

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

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

Conflicts:
	app/services/ci/create_pipeline_service.rb

Prevent job link form rendering when user does not have permissions

Closes #40739

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

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3566

Extract class responsible for building a pipeline / EE

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

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

Closes gitaly#737

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

The former is in Ruby's core lib, so is more flexible.

Use custom User-Agent header in GCP Client requests

Closes #40583

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

Reduce pipeline chain life span to minimize side effects

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

Closes gitaly#737

Fix a NoMethodError in Geo::MetricsUpdateService

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

Check that the "url" column exists in the GeoNode table before attempting to use it

Closes #4214

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

Run the Geo specs on dedicated runners

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

Import axios utils in commons chunks

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

# Conflicts:
#	app/services/ci/create_pipeline_service.rb
#	lib/gitlab/shell.rb
#	spec/javascripts/notes/components/issue_comment_form_spec.js
#	spec/services/projects/count_service_spec.rb

[ci skip]