only look for issues mentioned on description on MergeRequest#issues_mentioned_but_not_closing

2 files changed, 5 insertions, 3 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 6f660bf0e77..b8c139d01e2 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -570,18 +570,20 @@ class MergeRequest < ActiveRecord::Base
 
   def issues_mentioned_but_not_closing(current_user = self.author)
     issues = []
+    closing_issues = []
 
     if target_branch == project.default_branch
       messages = [description]
-      messages.concat(commits.map(&:safe_message)) if merge_request_diff
 
       ext = Gitlab::ReferenceExtractor.new(project, current_user)
       ext.analyze(messages.join("\n"))
 
       issues = ext.issues
+      closing_issues = Gitlab::ClosingIssueExtractor.new(project, current_user).
+        closed_by_message(messages.join("\n"))
     end
 
-    issues - closes_issues
+    issues - closing_issues
   end
 
   def target_project_path
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 688c78fb404..b2c26874552 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -294,7 +294,7 @@ describe MergeRequest, models: true do
       end
     end
 
-    it 'detects issues mentioned but not closed' do
+    it 'detects issues mentioned in description but not closed' do
       mentioned_issue = create(:issue, project: subject.project)
 
       subject.description = "Is related to #{mentioned_issue.to_reference}"