summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1b6e898a7fd..95e41106b49 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -368,7 +368,11 @@ class MergeRequest < ActiveRecord::Base
end
def merge_request_diff_for(diff_refs)
- merge_request_diffs.viewable.select_without_diff.with_diff_refs(diff_refs).take
+ @merge_request_diffs_by_diff_refs ||= Hash.new do |h, diff_refs|
+ h[diff_refs] = merge_request_diffs.viewable.select_without_diff.with_diff_refs(diff_refs).take
+ end
+
+ @merge_request_diffs_by_diff_refs[diff_refs]
end
def reload_diff_if_branch_changed