diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-03-15 16:46:39 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-03-15 16:46:39 +0000 |
| commit | 49d5c09758fe9cf6d7ab196be4bdb0f1f4b6b275 (patch) | |
| tree | cc0cd6539bfe5010db877ea12da1e64426999da4 /spec/lib/gitlab | |
| parent | b53c42774c5060fb0ba36b0a728b16434336030d (diff) | |
| parent | db908826656b78e099ab5e1d99d4524ad0751d13 (diff) | |
| download | gitlab-ce-49d5c09758fe9cf6d7ab196be4bdb0f1f4b6b275.tar.gz | |
Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into 'master'
Resolve "Reduce Redis usage from merge request diffs caching"
Closes #44191
See merge request gitlab-org/gitlab-ce!17746
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 a067c42b75b..f48ee8924e8 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 @@ -12,7 +12,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do diff_files end - it 'does not files marked as undiffable in .gitattributes' do + it 'does not highlight files marked as undiffable in .gitattributes' do allow_any_instance_of(Gitlab::Diff::File).to receive(:diffable?).and_return(false) expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines) |