diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 21:08:00 +0000 |
| commit | 69d6d3ca2013e97cfd2d89449669ea7bf475f4e9 (patch) | |
| tree | 2cc4227ebfc52b7603691f06b0b8e09e030e8428 /spec/helpers | |
| parent | 01fdcf49b1553c22ae116fe96cedd7b91d02225c (diff) | |
| download | gitlab-ce-69d6d3ca2013e97cfd2d89449669ea7bf475f4e9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/diff_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index def3078c652..7f988c60817 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -259,7 +259,7 @@ describe DiffHelper do end context '#render_overflow_warning?' do - let(:diffs_collection) { instance_double(Gitlab::Diff::FileCollection::MergeRequestDiff, diff_files: diff_files) } + let(:diffs_collection) { instance_double(Gitlab::Diff::FileCollection::MergeRequestDiff, raw_diff_files: diff_files) } let(:diff_files) { Gitlab::Git::DiffCollection.new(files) } let(:safe_file) { { too_large: false, diff: '' } } let(:large_file) { { too_large: true, diff: '' } } |