* master: (297 commits)
  Remove duplicate `rebase_commit_sha` field definition from schema
  Merge branch 'remove_labeled_issues_seed' into 'master'
  Create separate EE::DeploymentPlatform module
  Fixes cluster feature broken specs
  Fix typo in CHANGELOG entry for Geo doc fix
  Fix typos in gitlab:geo:check sentence
  Make it clearer database password only needed for 10.4 and up
  Add clarification pg password from 10.4 onward
  Move geo status check after db replication
  Remove duplicate manual NTP check
  Fix broken alignment of geo db docs
  EE Port for making IDE prettier
  Fix rebase commit SHA migration name
  Resolve conflict in lib/api/entities.rb
  Resolve conflict in doc/api/settings.md
  Resolve conflict in doc/api/boards.md
  Resolve conflict in app/models/concerns/deployment_platform.rb
  Resolve conflict in BranchesHelper by adding EE::BranchesHelper
  Fix conflicts in merge_request_widget.json spec
  Fix conflicts in mr_widget_options.js
  ...

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

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

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.

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

# Conflicts:
#	app/assets/images/icons.json
#	app/assets/images/icons.svg
#	app/assets/javascripts/projects/project_new.js
#	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
#	app/helpers/branches_helper.rb
#	app/models/concerns/deployment_platform.rb
#	doc/api/boards.md
#	doc/api/settings.md
#	lib/api/entities.rb
#	spec/fixtures/api/schemas/entities/merge_request_widget.json
#	spec/javascripts/lib/utils/text_utility_spec.js

[ci skip]

Prevent cluster migration spec from interfering with later specs

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