CE upstream - 2018-06-07 18:23 UTC

Closes #6216

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

[EE] Automate the basic API tests in a QA scenario

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

EE checks a license, which needs RequestStore enabled to avoid N+1
queries. However, enabling RequestStore causes Gitaly to complain about N+1
invocations, which we really don't care about here.

Resolve "Geo: Improve no downtime upgrade documentation"

Closes #5936

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

# Conflicts:
#   spec/factories/project_auto_devops.rb

Fix responsive layout of weight select in new issue page

Closes #6338

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

Fix unstyled form controls for admin settings

Closes #6214

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

Nonnegative integer weights in issuable sidebar

Closes #3969

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

Add assignee lists to boards

Closes #5784

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

Fix card class for integration forms

Closes gitlab-ce#47074

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

Port of '38542-application-control-panel-in-settings-page' to EE

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

EE: Resolve "Timeout searching group issues"

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

Resolve "Admin area > Appearance forms"

Closes #6213

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

Resolve "Geo: Automatically clean up stale lock files on Geo secondary"

Closes #5533

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

Use variables for authenticated example

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

# Conflicts:
#	app/views/admin/appearances/_form.html.haml
#	app/views/groups/labels/index.html.haml
#	app/views/projects/pipelines/_with_tabs.html.haml
#	app/views/shared/_label_row.html.haml
#	db/schema.rb
#	doc/topics/autodevops/index.md
#	lib/gitlab/favicon.rb
#	spec/lib/gitlab/favicon_spec.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]

Apply CE feature to EE: Resolve "Show `failure_reason` and improve failed jobs tab in pipeline detail view"

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

Apply CE feature to EE: Resolve "Show `failure_reason` and improve failed jobs tab in pipeline detail view"

Resolve "Automatically provide a Deploy Token to projects when Auto DevOps is enabled"

Closes #46075

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

Resolve "Show `failure_reason` and improve failed jobs tab in pipeline detail view"

Closes #44267

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

Add approval widget support for zero approvals.

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

Make CI job update entrypoint to work as keep-alive endpoint

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

Pass the --in-commit-order arg to `git-rev-list`

Closes #45062

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