CE upstream - 2018-12-04 18:45 UTC

Closes gitlab-ce#53600

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

Fix gitlab:geo:check rake task

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

Merge branch '8444-update-error-message-displayed-when-adding-an-unsupported-project-to-ops-dashboard' into 'master'

Resolve "Update error message displayed when adding an unsupported project to Ops Dashboard"

Closes #8444

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

Group SAML metadata endpoint

Closes #6090

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

EE: Use group clusters when deploying (DeploymentPlatform)

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

Merge branch 'ee-50626-searching-users-by-the-admin-panel-wipes-query-when-using-sort' into 'master'

Fix losing search query when sort users on admin users page

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

Remove code related to automatic merging

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

Port of Rename project's pipelines relation

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

Also adds tests for that feature flag, pushing it over
the danger-review limit requiring longer commit message.

Merge branch '8591-geo-http-403-when-dismissing-free-trial-of-gitlab-com-gold-message' into 'master'

Don't show 'Free Trial of GitLab.com Gold' message for secondary nodes

Closes #8591

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

We're moving the automatic merging logic to a separate repository, so
there's no need in keeping this file around.

[ci skip]

[ci skip]

Run Geo check during gitlab check task, plus refactors

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

Remove redundant indices on GitLab.com

Closes gitlab-ce#53993 and gitlab-ce#53989

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

add 11.6-ce-to-ee docs

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

Port to EE: Merge request pipelines

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

Extract code into IssueBoardEntity / serializer (follow up)

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

Support location.positions in code climate MR-widget

Closes #6813

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

AES-256-GCM cipher mode requires a key that is exactly 32 bytes long.
We already handle the case when the key is too long, by truncating, but
the key can also be too short in some installations. Switching to a key
that is always exactly the right length (by virtue of right-padding
ASCII 0 characters) allows encryption to proceed, without breaking
backward compatibility.

When the key is too short, encryption fails with an `ArgumentError`,
causing the web hooks functionality to be unusable. As a result, zero
rows can exist with values encrypted with the too-short key.

When the key is too long, it is silently truncated. In this case, the
key is unchanged, so values encrypted with the new too-long key will
still be successfully decrypted.

This reflects how we now create or update

If the service fails mid-point, then we should be able to re-run this
service. So, detect presence of any previously created Kubernetes
resource and update or create accordingly.

Fix specs accordingly. In the case of finalize_creation_service_spec.rb,
I decided to stub out the async worker rather than maintaining
individual stubs for various kubeclient calls for that worker.

Also add test cases for group clusters

We remove configure_project_service_account and replace
ClusterPlatformConfigureWorker as they perform exactly the same piece of
work. This also makes GKE cluster creation to be the same as Adding
existing cluster - they both now use another worker to execute
CreateOrUpdateNamespaceService.

Resolve "Bug: Avatar Icons have wrong tooltip in approval"

Closes #6309

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

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54868

Use new information-o icon for Security Dashboard

Closes #8506

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

Geo: Add LFS support to HTTP & SSH push to secondary specs

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

This reverts commit 22954f22

Geo: Fix push to secondary over SSH for LFS

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