# 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

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]

Fix N+1 queries in uploads check rake task

Closes #47924

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

The original MR [1] fixed red specs for Rails 5.
But while the failed specs were fixed, that changes brought new failed
specs which weren't caught up in [1].

This commit just fixes the fix. :)

New errors are like these:

```
Failed to upgrade to WebSocket (REQUEST_METHOD: GET, HTTP_CONNECTION: keep-alive, HTTP_UPGRADE: )
Finished "/-/boards/1/lists"[non-WebSocket] for 127.0.0.1 at 2018-06-20 18:09:26 +0200
```

[1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20015

Fall back to the first sign-in tab if the local storage value is bad

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

Don't generate `.mo` files

Closes #47979

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

If `current_signin_tab` is `#crowd`, then no tab will be active. Fix
this by using the first available tab.

Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324

Resolve "Web IDE "Commit" button should indicate when there's a subsequent step"

Closes #48133

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

Since we are only using `.po` files for translation we can shave off
some setup time.

Generating the `mo` files also regenerates the PO-files, including
fuzzy translations. Those cause a lot of bugs, and we don't need them
anymore since the `po` files are generated by an external translation service.

Ignore GitLab API hiccups in scripts/trigger-build

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

Merge branch '48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964' into 'master'

Resolve "qa/specs/features/login/ldap_spec.rb is failing after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19964"

Closes #48159

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

Initial pod logs documentation

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

Unify flay.rake and gettext.rake from EE

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