We will tackle the migration in a future release, as a background migration.

For now, hide these commas at the model layer.

1. There is no index on system_note_metadata's action column, so add a partial
   one on 'weight'.
2. update_column_in_batches expects a single column to be updated, but we need
   to null out note_html too. Using an SQL literal lets us get around this.
3. Arel's UpdateManager doesn't support joins, so use a subquery instead.
4. MySQL can't update from the same table referenced in the subquery. We use an
   alias to handle this case.

compat gitlab-ce!18466 label list page redesign with draggable labels

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

Add documentation

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

Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter

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

Change EKS article yaml frontmatter

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

Bump grape-path-helpers to solve a bug in GrapePathHelpers::NamedRouteMatcher

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

# Conflicts:
#   Gemfile.lock

CE upstream - 2018-06-06 15:12 UTC

Closes #4811 and gitlab-ce#47280

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

Moving rev-list lfs options to Lfschanges

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

[EE] update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)

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

Port of 43597-new-navigation-themes to EE

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

If you include this helper with a class that also implements `method_missing`,
this would result in AbstractController::DoubleRenderError.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19487#note_79096902.

Remove redundant has_internal_id

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

 Conflicts:
   app/models/ci/pipeline.rb

Fix related issues top padding

Closes #6330

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

Fix export issues modal

Closes #6319

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

Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and filter out file content from logs

[ci skip]

[ci skip]

# Conflicts:
#   app/views/projects/labels/index.html.haml

Merge branch '6014-geo-fix-index-for-outdated-projects-on-the-project-repository-states' into 'master'

Resolve "Geo - Revisit the indexes on the project_repository_states table"

Closes #6014

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

Member tabs EE port

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

Docs: Add EKS integration tutorial

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

Add EKS integration tutorial

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