Commit d5a3504c authored by Sean McGivern's avatar Sean McGivern Committed by Douglas Barbosa Alexandre

Merge branch 'mentioned-but-not-closed-issues-messages' into 'master'

Fix unclear closing issue behaviour on Merge Request show page

Closes #26152

See merge request !8345
parent 35121943
...@@ -576,11 +576,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -576,11 +576,7 @@ class MergeRequest < ActiveRecord::Base
ext = Gitlab::ReferenceExtractor.new(project, current_user) ext = Gitlab::ReferenceExtractor.new(project, current_user)
ext.analyze(description) ext.analyze(description)
issues = ext.issues ext.issues - closes_issues
closing_issues = Gitlab::ClosingIssueExtractor.new(project, current_user).
closed_by_message(description)
issues - closing_issues
end end
def target_project_path def target_project_path
......
---
title: Fix unclear closing issue behaviour on Merge Request show page
merge_request: 8345
author: Gabriel Gizotti
...@@ -283,12 +283,16 @@ describe MergeRequest, models: true do ...@@ -283,12 +283,16 @@ describe MergeRequest, models: true do
end end
describe '#issues_mentioned_but_not_closing' do describe '#issues_mentioned_but_not_closing' do
it 'detects issues mentioned in description but not closed' do let(:closing_issue) { create :issue, project: subject.project }
mentioned_issue = create(:issue, project: subject.project) let(:mentioned_issue) { create :issue, project: subject.project }
let(:commit) { double('commit', safe_message: "Fixes #{closing_issue.to_reference}") }
it 'detects issues mentioned in description but not closed' do
subject.project.team << [subject.author, :developer] subject.project.team << [subject.author, :developer]
subject.description = "Is related to #{mentioned_issue.to_reference}" subject.description = "Is related to #{mentioned_issue.to_reference} and #{closing_issue.to_reference}"
allow(subject).to receive(:commits).and_return([commit])
allow(subject.project).to receive(:default_branch). allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch) and_return(subject.target_branch)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment