diff options
Diffstat (limited to 'lib/gitlab/diff/file.rb')
-rw-r--r-- | lib/gitlab/diff/file.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 105f67de839..ac8b1334dda 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -107,19 +107,23 @@ module Gitlab end def new_blob_service - BlobsService.new(repository.project, new_content_sha, file_path) + BlobsService.new(repository.project, new_content_sha, file_path, + hidden_content: hidden_content?, + highlighted: highlighted?) end def old_blob_service - BlobsService.new(repository.project, old_content_sha, file_path) + BlobsService.new(repository.project, old_content_sha, file_path, + hidden_content: hidden_content?, + highlighted: highlighted?) end def new_blob - new_blob_service.fetch(highlighted: highlighted?) + new_blob_service.fetch end def old_blob - old_blob_service.fetch(highlighted: highlighted?) + old_blob_service.fetch end def content_sha @@ -244,6 +248,10 @@ module Gitlab private + def hidden_content? + collapsed? || too_large? || raw_diff.empty? + end + def highlighted? @highlighted_diff_lines.present? end |