Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-31

# Conflicts:
#	app/controllers/projects/lfs_api_controller.rb
#	spec/requests/lfs_http_spec.rb

[ci skip]

app/controllers/projects/lfs_api_controller.rb

@@ -4,8 +4,11 @@ class Projects::LfsApiController < Projects::GitHttpClientController
   include GitlabRoutingHelper
   include LfsRequest
 
+<<<<<<< HEAD
   prepend ::EE::Projects::LfsApiController
 
+=======
+>>>>>>> upstream/master
   LFS_TRANSFER_CONTENT_TYPE = 'application/octet-stream'.freeze
 
   skip_before_action :lfs_check_access!, only: [:deprecated]

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';

spec/requests/lfs_http_spec.rb

@@ -733,6 +733,7 @@ describe 'Git LFS API and storage' do
           expect(json_response['objects'].first['size']).to eq(sample_size)
           expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
           expect(json_response['objects'].first['actions']['upload']['header']).to eq({ 'Authorization' => authorization, 'Content-Type' => 'application/octet-stream' })
+<<<<<<< HEAD
         end
 
         ## EE-specific context
@@ -761,6 +762,8 @@ describe 'Git LFS API and storage' do
             expect(json_response['documentation_url']).to include('/help')
             expect(json_response['message']).to eql('Your push has been rejected, because this repository has exceeded its size limit of 300 MB by 50 MB. Please contact your GitLab administrator for more information.')
           end
+=======
+>>>>>>> upstream/master
         end
       end