# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/ci/yaml/README.md
#	doc/user/permissions.md
#	lib/gitlab/verify/job_artifacts.rb

[ci skip]

CE upstream - 2018-03-09 00:26 UTC

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

Move project fork spinach tests to RSpec

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

Move project active tab spinach tests to RSpec

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

Add `?ci_cd_only=true` query parameter to CI/CD GitHub status link -- CE backport

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

Add `?ci_cd_only=true` query parameter to CI/CD GitHub status link

Closes #5194

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

Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffs

Closes #43951

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

Fix crash when checking external authorization license

Closes #5203

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

Only check the global feature directly on `License` otherwise we would
also perform the check on the namespace which would cause a crash.

Cleanup and consolidate the CI yaml docs

Closes #42914 and #18945

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

Cleanup and consolidate the CI yaml docs

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

Add rake task to cleanup any existing exclusive lease

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

Geo: Clarify message about database replication not working

Closes #4924

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

Reschedule commits_count background migration

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

Fix index name to Rails default to ensure idempotency

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

Fixing sentence about getting help page

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

Resolve "Add ~"Next Patch Release" as a priority label"

Closes #43872

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

Resolve "Add DAST authentication example"

Closes #5147

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

EE port of merge-request-widget-source-branch-improvements

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

Docs: new article devops + game dev with GitLab

Closes #43948

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

Docs: new article devops + game dev with GitLab

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

Clarify what groups projects can be shared with.

Closes #39115

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

Wait for the pipeline to start before canceling it

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

Dont show remove source branch checkbox when user cannot remove the branch

Closes #33264

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

Cache `#can_be_resolved_in_ui?` git operations

Closes gitaly#1051

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

Put global project approval docs under Merge Request approvals

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

Resolve "Foreground verification of job artifacts"

Closes #43949

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

Implement foreground verification of CI artifacts (EE)

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

Correct permissions for locking discussions

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