From 1e5e56c698740e049a3fcf7b578ac006d5deef42 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Mon, 26 Dec 2016 15:03:05 +0000 Subject: Fix MR with files hidden by .gitattributes Don't try to highlight and cache files hidden by .gitattributes entries. --- lib/gitlab/diff/file_collection/merge_request_diff.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/gitlab/diff') diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb index 56530448f36..329d12f13d1 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb @@ -61,7 +61,10 @@ module Gitlab end def cacheable?(diff_file) - @merge_request_diff.present? && diff_file.blob && diff_file.blob.text? + @merge_request_diff.present? && + diff_file.blob && + diff_file.blob.text? && + @project.repository.diffable?(diff_file.blob) end def cache_key -- cgit v1.2.3