Merge branch 'sh-fix-issue-41735' into 'master'

Fix error 500 when viewing commit and merge request diffs

Closes #41735

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

lib/gitlab/git/repository.rb

@@ -1187,7 +1187,7 @@ module Gitlab
       end
 
       # Items should be of format [[commit_id, path], [commit_id1, path1]]
-      def batch_blobs(items, blob_size_limit: nil)
+      def batch_blobs(items, blob_size_limit: Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE)
         Gitlab::Git::Blob.batch(self, items, blob_size_limit: blob_size_limit)
       end
 

spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb

@@ -19,4 +19,18 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
 
     diff_files
   end
+
+  shared_examples 'initializes a DiffCollection' do
+    it 'returns a valid instance of a DiffCollection' do
+      expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
+    end
+  end
+
+  context 'with Gitaly disabled', :disable_gitaly do
+    it_behaves_like 'initializes a DiffCollection'
+  end
+
+  context 'with Gitaly enabled' do
+    it_behaves_like 'initializes a DiffCollection'
+  end
 end