Skip to content
Snippets Groups Projects
Commit 0ee5efbd authored by Luke Howell's avatar Luke Howell
Browse files

Prepend blank line to close message on merge request

- Added an extra new line to the prepend of the Close message

Fixes #21710
parent a4c56a2b
No related branches found
No related tags found
No related merge requests found
Please view this file on the master branch, on stable branches it's out of date.
 
v 8.12.0 (unreleased)
- Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
- Filter tags by name !6121
- Make push events have equal vertical spacing.
- Add two-factor recovery endpoint to internal API !5510
Loading
Loading
Loading
Loading
@@ -83,7 +83,7 @@ module MergeRequests
closes_issue = "Closes ##{iid}"
 
if merge_request.description.present?
merge_request.description += closes_issue.prepend("\n")
merge_request.description += closes_issue.prepend("\n\n")
else
merge_request.description = closes_issue
end
Loading
Loading
Loading
Loading
@@ -99,14 +99,14 @@ describe MergeRequests::BuildService, services: true do
let(:source_branch) { "#{issue.iid}-fix-issue" }
 
it 'appends "Closes #$issue-iid" to the description' do
expect(merge_request.description).to eq("#{commit_1.safe_message.split(/\n+/, 2).last}\nCloses ##{issue.iid}")
expect(merge_request.description).to eq("#{commit_1.safe_message.split(/\n+/, 2).last}\n\nCloses ##{issue.iid}")
end
 
context 'merge request already has a description set' do
let(:description) { 'Merge request description' }
 
it 'appends "Closes #$issue-iid" to the description' do
expect(merge_request.description).to eq("#{description}\nCloses ##{issue.iid}")
expect(merge_request.description).to eq("#{description}\n\nCloses ##{issue.iid}")
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment