Merge branch 'ce-to-ee-2018-07-31' into 'master'

CE upstream - 2018-07-31 21:22 UTC

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

changelogs/unreleased/sh-lfs-fix-content-type.yml

+---
+title: Fix LFS uploads not working with git-lfs 2.5.0
+merge_request: 20923
+author:
+type: fixed

spec/javascripts/.eslintrc.yml

@@ -30,7 +30,6 @@ rules:
   jasmine/no-spec-dupes:
     - warn
     - branch
-  no-console: off
   prefer-arrow-callback: off
   import/no-unresolved:
     - error

spec/javascripts/datetime_utility_spec.js

@@ -162,7 +162,6 @@ describe('getTimeframeWindowFrom', () => {
     const timeframe = datetimeUtility.getTimeframeWindowFrom(startDate, 5);
     expect(timeframe.length).toBe(5);
     timeframe.forEach((timeframeItem, index) => {
-      console.log(timeframeItem);
       expect(timeframeItem.getFullYear() === mockTimeframe[index].getFullYear()).toBe(true);
       expect(timeframeItem.getMonth() === mockTimeframe[index].getMonth()).toBe(true);
       expect(timeframeItem.getDate() === mockTimeframe[index].getDate()).toBeTruthy();

spec/javascripts/pdf/page_spec.js

@@ -30,7 +30,7 @@ describe('Page component', () => {
         done();
       })
       .catch((error) => {
-        console.error(error);
+        done.fail(error);
       });
   });
 

spec/javascripts/test_bundle.js

-/* eslint-disable jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle */
+/* eslint-disable
+  jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console
+*/
 
 import $ from 'jquery';
 import 'vendor/jasmine-jquery';