Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Gizotti <gabriel@gizotti.com>2016-11-23 14:03:53 +0300
committerGabriel Gizotti <gabriel@gizotti.com>2016-12-16 12:13:17 +0300
commite52e3ab5082599fd5a895de961b07584421a5cd2 (patch)
treecc5235f40e719a95ce48b153664f986fd6943d4f /app/models/merge_request.rb
parent49a70d1e45b4f841379db059177856671c65159c (diff)
Remove whole description from #merge_commit_message and add add closed issues
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b73d7acefea..62dd02936e2 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -615,7 +615,8 @@ class MergeRequest < ActiveRecord::Base
def merge_commit_message
message = "Merge branch '#{source_branch}' into '#{target_branch}'\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