Commit e52e3ab5 authored by Gabriel Gizotti's avatar Gabriel Gizotti

Remove whole description from #merge_commit_message and add add closed issues

parent 49a70d1e
...@@ -615,7 +615,8 @@ class MergeRequest < ActiveRecord::Base ...@@ -615,7 +615,8 @@ class MergeRequest < ActiveRecord::Base
def merge_commit_message def merge_commit_message
message = "Merge branch '#{source_branch}' into '#{target_branch}'\n\n" message = "Merge branch '#{source_branch}' into '#{target_branch}'\n\n"
message << "#{title}\n\n" message << "#{title}\n\n"
message << "#{description}\n\n" if description.present? mr_closes_issues = closes_issues
message << "Closed Issues: #{mr_closes_issues.map { |issue| issue.to_reference(target_project) }.join(", ")}\n\n" if mr_closes_issues.present?
message << "See merge request #{to_reference}" message << "See merge request #{to_reference}"
message message
......
...@@ -410,11 +410,17 @@ describe MergeRequest, models: true do ...@@ -410,11 +410,17 @@ describe MergeRequest, models: true do
.to match("Remove all technical debt\n\n") .to match("Remove all technical debt\n\n")
end end
it 'includes its description in the body' do it 'includes its closed issues in the body' do
request = build(:merge_request, description: 'By removing all code') issue = create(:issue, project: subject.project)
expect(request.merge_commit_message) subject.project.team << [subject.author, :developer]
.to match("By removing all code\n\n") subject.description = "Closes #{issue.to_reference}"
allow(subject.project).to receive(:default_branch).
and_return(subject.target_branch)
expect(subject.merge_commit_message)
.to match("Closed Issues: #{issue.to_reference}")
end end
it 'includes its reference in the body' do it 'includes its reference in the body' do
......
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