CE upstream - 2018-06-22 09:21 UTC

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

Update squash_and_merge.md to fix link

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

Add ip_address to json examples in Runner API docs

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

# Conflicts:
#	doc/topics/autodevops/index.md

[ci skip]

Unify spec/support/redis/redis_shared_examples.rb

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

Document end to end flow for Kubernetes and Auto DevOps

Closes #44455

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

Docs/autodevops k8s ee

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

[Rails5] Force the `protect_from_forgery` callback run first

Closes #48204

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

Unify object_storage_spec.rb with EE

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

Merge branch '6534-broken-geo-qa-scenario-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19568' into 'master'

Resolve "Broken Geo QA scenario after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19568"

Closes #6534

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

CE upstream - 2018-06-22 06:09 UTC

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

Unify spec/services/auth/container_registry_authentication_service_spec.rb

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

# Conflicts:
#	app/controllers/sessions_controller.rb

[ci skip]

CE upstream - 2018-06-21 18:21 UTC

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

EE: Use expect_next_instance_of to replace expect_any_instance_of

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

Use expect_next_instance_of to replace expect_any_instance_of

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

Show a reCAPTCHA on signin page if custom header is set

Closes #48184

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

Show a reCAPTCHA on signin page if custom header is set

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

This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP
header.

This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP
header.

Remove lib/gitlab/git EE diff

Closes #6525

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

Retroactively add changelogs

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

Enable webpack nodeEnv optimization

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

For community contributions, changelogs
should be added to the MR.

# Conflicts:
#	app/assets/javascripts/notes/components/comment_form.vue
#	app/models/concerns/issuable.rb
#	app/models/merge_request.rb

[ci skip]

Fix diff comment alignment for parallel code additions

Closes #47861

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

Resolve "Geo: Add verification information to 'gitlab-rake geo:status'"

Closes #6467

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