summaryrefslogtreecommitdiff
path: root/app/models/issue.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-12 12:04:20 +0200
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-10-16 09:46:59 +0200
commit9f9f0c35ecd9f7a5a057030253791d051f832f6d (patch)
tree40d69fa1493e50bef566d104b58c4316db69d95b /app/models/issue.rb
parentbd3689e9e0aebe43f7c5f787e03a3bbaa8b2ef68 (diff)
downloadgitlab-ce-9f9f0c35ecd9f7a5a057030253791d051f832f6d.tar.gz
Show merge requests which close current issue
Diffstat (limited to 'app/models/issue.rb')
-rw-r--r--app/models/issue.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index fc7e9abe29e..c24a329847c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -95,4 +95,14 @@ class Issue < ActiveRecord::Base
def source_project
project
end
+
+ # From all notes on this issue, we'll select the system notes about linked
+ # merge requests. Of those, the MRs closing `self` are returned.
+ def closed_by_merge_requests(current_user)
+ notes.system.flat_map do |note|
+ ext = Gitlab::ReferenceExtractor.new(self.project, current_user)
+ ext.analyze(note.note)
+ ext.merge_requests
+ end.uniq.select { |mr| mr.closes_issue?(self) }
+ end
end