delta/gitlab/gitlab-ce.git, branch performance-bar-sql

Remove Sherlock usage from the performance bar

2017-10-23T11:59:07+00:00

Sherlock::Query generates a backtrace on every call to "new", which is
very slow. Formatter queries are also not displayed properly due to the
lack of "white-space: pre" in the CSS. We took a look at fixing this,
but the produced output is not really better than just displaying
queries on one line.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39351

Merge branch 'update-nav-sidebar-hover' into 'master'

2017-10-19T20:07:43+00:00

Update nav sidebar hover color to increase contrast

Closes #37660

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

Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master'

2017-10-19T15:21:23+00:00

Updates google.md to match current version.

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

Merge branch 'sh-document-plus-encoding-api' into 'master'

2017-10-19T15:19:12+00:00

Document converting `+` to `%2B` in an API query parameter

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

Merge branch 'sh-api-json-logs' into 'master'

2017-10-19T15:17:35+00:00

Add docs for `api_json.log` file

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

Merge branch 'bvl-port-of-ee-translations' into 'master'

2017-10-19T14:40:30+00:00

CE port of EE translations

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

Merge branch 'master-i18n' into 'master'

2017-10-19T13:50:25+00:00

New Crowdin translations

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

Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' into 'master'

2017-10-19T13:43:22+00:00

Update Prometheus gem to fix problems with other Processes overwriting current metrics file

Closes #36714

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

Merge branch 'rc/balance-test-job-nodes' into 'master'

2017-10-19T13:04:42+00:00

Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes

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

Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' into 'master'

2017-10-19T13:02:16+00:00

Improve the .tests-metadata-state definition a bit

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