CE upstream - Sunday

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

# 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