diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-01-07 14:34:32 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-08 13:31:10 -0600 |
commit | c3debf1ef6b2e9421d62fcd0a3c0d501e6adaf35 (patch) | |
tree | 4abc01d0de7552beb21e0f8d31d534fd5fd60f0c | |
parent | e1b74c0bf107cc8ff4150922df0595f1521088b3 (diff) | |
download | gitlab-ce-c3debf1ef6b2e9421d62fcd0a3c0d501e6adaf35.tar.gz |
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
-rw-r--r-- | lib/gitlab/git/repository.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 17c05c44d7e..69c52d6b640 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1185,7 +1185,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 diff --git a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb index d81774c8b8f..a067c42b75b 100644 --- a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb +++ b/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 |