diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-08 10:37:11 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-08 13:54:11 +0100 |
| commit | 87aba17ecdc74cac627dbd6731ea000933182f3a (patch) | |
| tree | 60925b0474896de9c56e26d0e14ba3d6f86a3f61 | |
| parent | 32e593c66323a2cc5cd3b25070c9ae8db725f5be (diff) | |
| download | gitlab-ce-87aba17ecdc74cac627dbd6731ea000933182f3a.tar.gz | |
Memoize diffs with path options set separately
| -rw-r--r-- | app/models/merge_request_diff.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 06b28fc5a75..7e22491d0a3 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -46,7 +46,8 @@ class MergeRequestDiff < ActiveRecord::Base compare.diffs(options) end else - @diffs ||= load_diffs(st_diffs, options) + @diffs ||= {} + @diffs[options[:paths]] ||= load_diffs(st_diffs, options) end end |