Merge branch 'dm-update-batch-loader' into 'master'

Update batch-loader dependency

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

Gemfile

@@ -298,7 +298,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
 
-gem 'batch-loader', '~> 1.2.1'
+gem 'batch-loader', '~> 1.2.2'
 
 # Perf bar
 gem 'peek', '~> 1.0.1'

Gemfile.lock

@@ -73,7 +73,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
     base32 (0.3.2)
-    batch-loader (1.2.1)
+    batch-loader (1.2.2)
     bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
@@ -950,7 +950,7 @@ DEPENDENCIES
   awesome_print
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
-  batch-loader (~> 1.2.1)
+  batch-loader (~> 1.2.2)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.5.0)

Gemfile.rails4.lock

@@ -70,7 +70,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
     base32 (0.3.2)
-    batch-loader (1.2.1)
+    batch-loader (1.2.2)
     bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
@@ -941,7 +941,7 @@ DEPENDENCIES
   awesome_print
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
-  batch-loader (~> 1.2.1)
+  batch-loader (~> 1.2.2)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.5.0)

spec/models/blob_spec.rb

@@ -18,6 +18,7 @@ describe Blob do
 
   describe '.lazy' do
     let(:project) { create(:project, :repository) }
+    let(:same_project) { Project.find(project.id) }
     let(:other_project) { create(:project, :repository) }
     let(:commit_id) { 'e63f41fe459e62e1228fcef60d7189127aeba95a' }
 
@@ -32,7 +33,7 @@ describe Blob do
       expect(other_project.repository).not_to receive(:blobs_at)
 
       changelog = described_class.lazy(project, commit_id, 'CHANGELOG')
-      contributing = described_class.lazy(project, commit_id, 'CONTRIBUTING.md')
+      contributing = described_class.lazy(same_project, commit_id, 'CONTRIBUTING.md')
 
       described_class.lazy(other_project, commit_id, 'CHANGELOG')