# Conflicts:
#	app/workers/check_gcp_project_billing_worker.rb
#	spec/features/projects/clusters/gcp_spec.rb
#	spec/workers/check_gcp_project_billing_worker_spec.rb

[ci skip]

CE upstream - Sunday

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

Merge branch 'ee-39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master'

EE Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled"

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

Merge branch '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master'

Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled"

Closes #39957 and #41410

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

CE upstream - Sunday

Closes #10

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

Fix restoring associations with import/export

Closes #41646

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

# Conflicts:
#	db/schema.rb
#	spec/features/projects/jobs_spec.rb

[ci skip]

10.4 licenses update

Closes #10

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

10.4 templates update

Closes #10

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

Fix error 500 when viewing commit and merge request diffs

Closes #41735

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

Due to the refactoring in !16082, `Blob#batch` no longer falls back
to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
method.

This fix here is to be consistent and use a non-nil default value in
`Repository#batch_blobs`.

The problem was masked in development and tests because Gitaly is always
enabled by default for all features.

Closes #41735

Port of 22643-manual-job-page to EE

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

10.4 ce-to-ee doc update

Closes #10

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

CE upstream - Saturday

Closes gitlab-development-kit#310 and gitaly#872

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

Merge branch 'master' into ee-39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

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