Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/views/layouts/devise.html.haml
#	app/views/layouts/devise_empty.html.haml
#	app/views/projects/project_members/index.html.haml
#	spec/requests/api/commits_spec.rb

[ci skip]

Fix default wait argument in QA Pipelines spec

Closes gitlab-qa#268

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

Add documentation

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

Add documentation about disabling license_management jobs in CI with a variable.

Closes #47325

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

Update vendored ADO template with adding of license management

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

Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter

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

Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter

Closes #45505

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

Resolve "ActionView::Template::Error: undefined method `human_import_status_name"

Closes #47208

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

Correct docs that mirror push is in Core

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

Change EKS article yaml frontmatter

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

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

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

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

# 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

Moving rev-list lfs options to LfsChanges

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

Log response body to production_json.log when a controller responds with a 422 status

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

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

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

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

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

Resolve "Introduce new navigation themes in GitLab 11.0"

Closes #43597

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

Port of 43597-new-navigation-themes to EE

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

Fixed typo "all all" lines 25-26 (index.md)

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

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

Revert "Merge branch 'jivl-fix-labels-page' into 'master'"

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

Resolve "Kubernetes cluster information page > Advanced Settings > Fix styling of remove cluster section"

Closes #47433

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