Merge branch 'ee-53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup' into 'master'

Update gitlab-markup gem to avoid binary name collision

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

CE upstream - 2018-11-12 00:21 UTC

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

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8394

# Conflicts:
#	doc/ci/examples/deployment/composer-npm-deploy.md
#	doc/development/documentation/styleguide.md

[ci skip]

Docs: Update Variable naming - EE Port

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

Docs: Update Variable naming

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

See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082

CE upstream - 2018-11-11 17:21 UTC

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

Fix error handling bugs in kubernetes integration

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

CE upstream - 2018-11-09 23:30 UTC

Closes gitlab-org/release/framework#48 and gitlab-ce#53773

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

# Conflicts:
#	app/views/clusters/clusters/_sidebar.html.haml
#	lib/gitlab/background_migration/redact_links.rb
#	locale/gitlab.pot

[ci skip]

Use gitlab-ui in jobs and pipelines

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

EE: User can create a group level cluster and install applications

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

Remove circular dependency on Redactable in migration

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

Remove circular dependency on Redactable in migration

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

Resolve "GitLab Pages settings regressions"

Closes #48475

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

Updates clipboard button with gitlab-ui

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

Gitlab::BackgroundMigration::RedactLinks was prepending
EE::Gitlab::BackgroundMigration::RedactLinks, while
EE::Gitlab::BackgroundMigration::RedactLinks was trying to include
Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed
with an uninitialized constant
(https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).

Gitlab::BackgroundMigration::RedactLinks was prepending
EE::Gitlab::BackgroundMigration::RedactLinks, while
EE::Gitlab::BackgroundMigration::RedactLinks was trying to include
Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed
with an uninitialized constant
(https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).

Fix alignment of diff comment buttons

Closes #53768

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

Fix DashboardHelper reference in spec

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

Helpers::DashboardHelper doesn't actually exist, and Ruby 2.5 gets rid
of the automatic top-level constant lookup
(https://bugs.ruby-lang.org/issues/11547).

Resolve possible cherry pick API race condition

Closes #53773

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

Enable even more frozen string in lib/gitlab

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

Symlinked hooks aren't executed

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

Ensure we create the secrets at the right time

Closes #53621

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

Previously, we just fetched the latest commit for the given branch when
presenting the resulting commit, but because something could have been
committed to that branch between the time we cherry-picked and the time
we render the result, the wrong commit could have been presented.

Now, we fetch the commit object with the commit SHA returned by the
commit change service, which should always be the correct commit.

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

Add revert to commits API

Closes gitlab-org/release/framework#48

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

Updates clipboard button component to use
the new glTooltipDirective and the new glButton
component from gitlab-ui

However, we only need to raise for project_type clusters to maintain
previous behaviour.

In all probablity this requirement to have actual_namespace came from
KubernetesService and will no longer be required soon.

Use presenters instead otherwise we will have x2 overides in EE