CE upstream - 2018-06-18 18:21 UTC

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

Port of PO validation

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

Port of PO validation

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

Add Ultimate badge to license management

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

Make sure the security report strings don't mix variable usage. This
is now validated.

Eliminate N+1 queries in path lock checks during a push

Closes #6465

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

Updates to `.po` & `.pot` linting

Closes #46096 et #39292

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

This reverts commit 3b4f1681.

This reverts commit fdfce1a8.

This reverts commit ada2c529.

Extract EE-specific lines from discussion views

Closes #6103 et #6226

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

Group SAML settings link checks license

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

[EE] Extract EE specific files/lines for spec/lib/gitlab/ci

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

This significantly improves performance when a user
pushes many references.

`project.path_locks.any?` doesn't cache the output and runs `SELECT 1 AS one
FROM "path_locks" WHERE project_id = N` each time. When there are thousands of
refs being pushed, this can time out the unicorn worker.

Closes #6465

This reverts commit 98d881d2.

Resolve "Use `long-arrow` icon in downstream pipeline instead of importing the svg into the vue component"

Closes #5538

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

Resolve "Assignee list UI should only appear in Premium or higher"

Closes #6474

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

# Conflicts:
#	app/views/projects/clusters/_sidebar.html.haml
#	locale/gitlab.pot

[ci skip]

Update read-only message banner styling for Geo secondary node

Closes #4966

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

Updates to `.po` & `.pot` linting

Closes #46096 et #39292

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

Memoize the global default for push rules within the request

Closes #6465

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

CE upstream - 2018-06-18 15:21 UTC

Closes gitlab-runner#2211

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

port 5956-auto-devops-multi-cluster-help-text to CE

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

Resolve "Geo: Slow JOIN query with project_repository_states"

Closes #6053

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

CE upstream - 2018-06-18 09:22 UTC

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