summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff/file_collection/merge_request_diff.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/diff/file_collection/merge_request_diff.rb')
-rw-r--r--lib/gitlab/diff/file_collection/merge_request_diff.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb
index 26bb0bc16f5..56530448f36 100644
--- a/lib/gitlab/diff/file_collection/merge_request_diff.rb
+++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb
@@ -61,7 +61,7 @@ module Gitlab
end
def cacheable?(diff_file)
- @merge_request_diff.present? && diff_file.blob.text?
+ @merge_request_diff.present? && diff_file.blob && diff_file.blob.text?
end
def cache_key