summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-03-31 17:39:14 -0600
committerDouwe Maan <douwe@selenight.nl>2017-04-08 14:37:46 -0500
commitb202b42cfee6bb8cf0c142c918c545f45464a29c (patch)
treebcdc1d30a4ec2c11fd4b388cac69a450051943e6 /app/models/merge_request.rb
parent3d1cade13f61115b63bf6dbda5a1f194ba54b24b (diff)
downloadgitlab-ce-b202b42cfee6bb8cf0c142c918c545f45464a29c.tar.gz
Link to outdated diff in older MR version from outdated diff discussion
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b71a9e17a93..1b6e898a7fd 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -367,6 +367,10 @@ class MergeRequest < ActiveRecord::Base
merge_request_diff(true)
end
+ def merge_request_diff_for(diff_refs)
+ merge_request_diffs.viewable.select_without_diff.with_diff_refs(diff_refs).take
+ end
+
def reload_diff_if_branch_changed
if source_branch_changed? || target_branch_changed?
reload_diff