diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-07 03:11:45 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-06-07 03:11:45 +0300 |
| commit | c92902791f2de83d62f446076c4b8ed69ab7a57b (patch) | |
| tree | e03028dc3cedc92acf4dd4aee1e13428d5d82718 | |
| parent | 3d501a4937bd08479e4f5313f050c58aa64063da (diff) | |
Return nil if there is no uncached blob
| -rw-r--r-- | app/models/blobs_service.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/diff/file_collection/merge_request_diff.rb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/models/blobs_service.rb b/app/models/blobs_service.rb index 88d4ee900f1..5469c3a9a3e 100644 --- a/app/models/blobs_service.rb +++ b/app/models/blobs_service.rb @@ -11,6 +11,7 @@ class BlobsService def write_cache_if_empty return unless content_sha return if cache_exists? + return unless uncached_blob blob_cache = { id: uncached_blob.id, raw_size: uncached_blob.raw_size, diff --git a/lib/gitlab/diff/file_collection/merge_request_diff.rb b/lib/gitlab/diff/file_collection/merge_request_diff.rb index ba3fd6b7403..369c760b34a 100644 --- a/lib/gitlab/diff/file_collection/merge_request_diff.rb +++ b/lib/gitlab/diff/file_collection/merge_request_diff.rb @@ -75,11 +75,7 @@ module Gitlab if highlight_cache[item_key] highlight_diff_file_from_cache!(diff_file, highlight_cache[item_key]) else - if cacheable?(diff_file) - highlight_cache[item_key] = diff_file.highlighted_diff_lines.map(&:to_hash) - else - binding.pry - end + highlight_cache[item_key] = diff_file.highlighted_diff_lines.map(&:to_hash) if cacheable?(diff_file) end end |