From af5d7dea7f76edd19d0de748c0620eab9aaf1561 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 4 Dec 2018 11:46:24 +0100
Subject: Update batch-loader dependency

---
 Gemfile                  | 2 +-
 Gemfile.lock             | 4 ++--
 Gemfile.rails4.lock      | 4 ++--
 spec/models/blob_spec.rb | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index e37cadc128a..022f7e5dbcc 100644
--- a/Gemfile
+++ b/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index e7873932dad..699d77615aa 100644
--- a/Gemfile.lock
+++ b/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)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index 7478e2173bd..15e0b782d5b 100644
--- a/Gemfile.rails4.lock
+++ b/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)
diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb
index ed93f94d893..e8c03b587e2 100644
--- a/spec/models/blob_spec.rb
+++ b/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')
 
-- 
cgit v1.2.3