diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-25 16:19:03 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-25 16:19:03 +0000 |
commit | 746b6ec82d1ed29a679fe4dc6a93b2d0228e9d34 (patch) | |
tree | 71da30c69003967fad3c67595aa46fa6130a618d /lib/gitlab | |
parent | d03ca3d02e39d32e41e26f1100dcb793a7d758ad (diff) | |
parent | 847ada36c48107442f69338eda4c0b601ab98b48 (diff) | |
download | gitlab-ce-746b6ec82d1ed29a679fe4dc6a93b2d0228e9d34.tar.gz |
Merge branch 'timeout-merge-request-for-binary-file' into 'master'
Fix: Timeout creating and viewing merge request for binary file
See merge request !7713
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb index fe7adb7bed6..26bb0bc16f5 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb @@ -20,7 +20,7 @@ module Gitlab # Extracted method to highlight in the same iteration to the diff_collection. def decorate_diff!(diff) diff_file = super - cache_highlight!(diff_file) if cacheable? + cache_highlight!(diff_file) if cacheable?(diff_file) diff_file end @@ -60,8 +60,8 @@ module Gitlab Rails.cache.write(cache_key, highlight_cache) if @highlight_cache_was_empty end - def cacheable? - @merge_request_diff.present? + def cacheable?(diff_file) + @merge_request_diff.present? && diff_file.blob.text? end def cache_key |