# Conflicts:
#	db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb
#	lib/gitlab/git/repository.rb

[ci skip]

Fix rebase commit SHA migration name

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

CE upstream - Friday

Closes gitaly#833 and gitlab-ce#41563

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

Merge branch '41056-create-cluster-from-kubernetes-integration-application-template-ee' into 'master'

Create Separate EE::DeploymentPlatform module

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

Remove labeled issues seed

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

Skip project repository disk validation in development project seeder

Closes gitlab-development-kit#310

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

Move gitlab:geo:check after database replication

Closes #4481

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

Fix broken alignment of database password in geo docs

Closes #4483

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

Remove labeled issues seed

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

Until db replication is completed the secondary will not have the
configuration needed to pass many of the status checks

Remove NTP check from geo docs

Closes #4480

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

The NTP check is now included in `gitlab-rake gitlab:geo:check`

EE Port for making IDE prettier

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

This already existed in EE with a different timestamp, so rename for CE and make
it idempotent.

Move git operations for multi_action into Gitlab::Git

Closes gitaly#872

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

Fix links to deprecated doc page (speed_up_ssh => fast_ssh_key_lookup)

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Prevent cluster migration spec from interfering with later specs

Closes #4479

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