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

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

Closes #6467

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

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

Closes gitaly#1138

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

Restore custom hooks for wiki

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

Fix multiple active tabs when Crowd or LDAP is in use

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

Resolve "Extract EE specific files/lines for project_creator_spec"

Closes #6436 and #6149

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

EE-specific repository disk access exceptions, part 2

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

# Conflicts:
#	lib/gitlab/usage_data.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]

Changes tab VUE refactoring (EE port)

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

Fix load balancing configuration not working with Geo tracking database

Closes #6480

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

[Rails5] Set request.format in commits_controller

Closes #48144 et #48143

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

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

Closes gitlab-qa#263

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

Add enabled prefix to feature keys to be consistent with other keys

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

Port of da-usage-ping to EE

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

Properly detect label reference if followed by period or question mark

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

[Rails5] Fix ActionCable's mount_path configuration

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

Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit

Closes #48140 et #48139

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

Raw changes calculation is Gitaly only now

Closes gitaly#1138

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

Re-added JS snippet to enable Group SAML in docs

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

EE-specific repository disk access exceptions, part 1

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

Add a cop for `FinderMethods`

Closes #42705

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

We need this because `expect_any_instance_of` doesn't work on
prepended models. Now we could use the same code between CE/EE

Closes https://gitlab.com/gitlab-org/gitaly/issues/1138

[ci skip]

[ci skip]

[ci skip]

Fix a couple Vuex typos

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

Docs: update style guidelines with rules for navigation items

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

# Conflicts:
#	app/assets/javascripts/boards/filtered_search_boards.js

[ci skip]