kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove whole description from #merge_commit_message and add add closed issues

Browse source
This commit is contained in:
Gabriel Gizotti 2016-11-23 21:03:53 +10:00
parent 49a70d1e45
commit e52e3ab508
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/merge_request.rb
View file

@ -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

14
spec/models/merge_request_spec.rb
View file

@ -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