Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/app/models/blob.rb b/app/models/blob.rb
index 42ee00bc196..258006d8d2e 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -83,9 +83,9 @@ class Blob < SimpleDelegator
     new(blob, project)
   end
 
-  def self.lazy(project, commit_id, path)
+  def self.lazy(project, commit_id, path, blob_size_limit: Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE)
     BatchLoader.for([commit_id, path]).batch(key: project.repository) do |items, loader, args|
-      args[:key].blobs_at(items).each do |blob|
+      args[:key].blobs_at(items, blob_size_limit: blob_size_limit).each do |blob|
         loader.call([blob.commit_id, blob.path], blob) if blob
       end
     end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index ee919f844dc..e7ad38864c8 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -516,10 +516,12 @@ class Repository
   end
 
   # items is an Array like: [[oid, path], [oid1, path1]]
-  def blobs_at(items)
+  def blobs_at(items, blob_size_limit: Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE)
     return [] unless exists?
 
-    raw_repository.batch_blobs(items).map { |blob| Blob.decorate(blob, project) }
+    raw_repository.batch_blobs(items, blob_size_limit: blob_size_limit).map do |blob|
+      Blob.decorate(blob, project)
+    end
   end
 
   def root_ref