Fix load balancing configuration not working with Geo tracking database

Closes #6480

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

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

Closes gitlab-qa#263

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

Port of da-usage-ping to EE

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

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

[ci skip]

[ci skip]

# 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

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

Notify only merge request unmergeable due to conflict

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

Limitless weight value

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

Added Wiki Scenario Automation gitlab-qa#263

Closes gitlab-qa#263

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

Fix admin group plan row

Closes #6482

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

CE upstream - 2018-06-20 15:42 UTC

Closes gitaly#889

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

Resolve "Custom logo rendering improperly on sign-in page"

Closes #47964

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

Make the stubbed methods for SAML authorize paths more specific

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

CE-EE parity for Platform feature specs

Closes #6499

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

Backport code from gitlab-ee!6182

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

Migrate EE specific code in `app/views/layouts/nav/sidebar/_project.html.haml`

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