Automatic merge of gitlab-org/gitlab-ce master

GITLAB_WORKHORSE_VERSION

-8.5.1
+8.6.0

app/assets/javascripts/diffs/constants.js

@@ -49,4 +49,4 @@ export const TYPE_KEY = 'type';
 export const LEFT_LINE_KEY = 'left';
 
 export const CENTERED_LIMITED_CONTAINER_CLASSES =
-  'container-limited limit-container-width mx-auto px-3';
+  'container-limited limit-container-width mx-lg-auto px-3';

changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml

+---
+title: Fix long file header names bug in diffs
+merge_request: 27233
+author:
+type: fixed

changelogs/unreleased/fj-bump-workhorse-version-8-6-0.yml

+---
+title: Update GitLab Workhorse to v8.6.0
+merge_request: 27260
+author:
+type: fixed

spec/frontend/clusters/clusters_bundle_spec.js

@@ -12,7 +12,7 @@ import { setTestTimeout } from 'helpers/timeout';
 import $ from 'jquery';
 
 describe('Clusters', () => {
-  setTestTimeout(500);
+  setTestTimeout(1000);
 
   let cluster;
   let mock;