Fix Geo secondary node API tests by waiting for services to start properly

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

Unify app/services/boards

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

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

Closes gitaly#221 and gitaly#393

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

Geo: Add a suggestion to run `make geo-setup` in the development environment

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

[Rails5] Fix "'-1' is not a valid data_store"

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

Update lfs_administration.md with language edits

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

Add troubleshooting guide for lfs uploading timeouts

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

FindRefName RPC now mandatory

Closes gitaly#221

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

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

Closes gitaly#327 and gitlab-ce#47893

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

Docs: add inline badges to Auto DevOps features list

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

Docs: add inline badges to Auto DevOps features list

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

Disallow methods that copy data on large tables

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

Fix ruby sampler metrics

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

Resolve EE merge conflict

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

Repository size is Gitaly only

Closes gitaly#393

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

Merge branch '6540-localized-string-appearing-as-_-audit-events-and-_-service-desk-in-the-sidebar' into 'master'

Fix appearance of 'Audit Events' and 'Service Desk' in the project sidebar

Closes #6540

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

* Use a simple counter for sampler duration instead of a histogram.
* Use a counter to collect GC time.
* Remove unused objects metric.
* Cleanup metric names to match Prometheus conventions.
* Prefix generic GC stats with `gc_stat`.
* Include worker label on memory and file descriptor metrics.

Unify spec/features/issues/filtered_search/filter_issues_spec.rb

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

Add docs for RequestCache

Closes #48094

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

These are all over 20 GB on GitLab.com. merge_request_diff_commits is several
hundred gigabytes in size.

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

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

Update squash_and_merge.md to fix link and description

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

Update squash_and_merge.md to fix link

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

(cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)

Add ip_address to json examples in Runner API docs

Closes #47973

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

Add ip_address to json examples in Runner API docs

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

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