CE upstream - 2018-06-07 10:47 UTC

Closes gitlab-qa#268

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

Spell out all the words when matching ls-remote

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

Initial updates to multi_project_pipeline_graphs.md

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

Resolve "[Geo] Missing "\n" in rake geo:status"

Closes #6324

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

Consistently use tar lookup function (EE version)

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

Set installation type and pass it to usage_ping data

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

Update error description for `ee-specific-lines-check` to contain useful information

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

Update related_issues.md for grammar/clarity.

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

Docs: article - Deploy SB apps to CF with GitLab CI/CD

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

Resolve "Update auto devops flow to support multi-cluster setup"

Closes #5956

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

Fix billing card style

Closes #6326

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

When last_cursor_event_date was't available, this resulted in a missing
newline which messed up the following line.

Document how to use multiple clusters with Auto DevOps

Closes #5887

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

Docs: article - Deploy SB apps to CF with GitLab CI/CD

Closes #47505 and #37524

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

Resolve "Extract EE specific files/lines for app/views/admin/groups"

Closes #6216

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

Add service discovery for the DB load balancer

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

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

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

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

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

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

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

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

# 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

Use this regular expression:

    %r{(?<=refs/heads/|refs/tags/).+}

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