diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-06 16:24:32 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-08 09:32:57 -0500 |
| commit | ffbbd4112eb5a0a927925e70644128bf25145414 (patch) | |
| tree | 110e91e2a110d02018451fc9a5639c8249336f21 /lib/gitlab/diff/file_collection | |
| parent | ba564a09d73dce3a6696dfeb55e78648ae23e627 (diff) | |
| download | gitlab-ce-ffbbd4112eb5a0a927925e70644128bf25145414.tar.gz | |
Move diffable? method from Repository to Diff::Filedm-diff-file-diffable
Diffstat (limited to 'lib/gitlab/diff/file_collection')
| -rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb index 9a58b500a2c..fcda1fe2233 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb @@ -66,10 +66,7 @@ module Gitlab end def cacheable?(diff_file) - @merge_request_diff.present? && - diff_file.blob && - diff_file.blob.text? && - @project.repository.diffable?(diff_file.blob) + @merge_request_diff.present? && diff_file.text? && diff_file.diffable? end def cache_key |