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-28 15:11:45 +0300
committerGabriel Gizotti <gabriel@gizotti.com>2016-12-16 12:13:17 +0300
commit4181528569a81004d4e64f3e9726fc653a322cc7 (patch)
tree89925d4ce2ae6fb8161df391981cf25248784860 /app/models/merge_request.rb
parente97c7100aed6fb4ca072c80a78b95d5f51805197 (diff)
Better `Closes issues` text for MergeRequest#merge_commit_message
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 2d7be2c2c7e..48c30b08502 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -637,7 +637,8 @@ class MergeRequest < ActiveRecord::Base
message << "#{title}\n\n"
if closes_issues_references.present?
- message << "Closed Issues: #{closes_issues_references.join(", ")}\n\n"
+ issue_text = 'issue'.pluralize(closes_issues_references.size)
+ message << "Closes #{issue_text} #{closes_issues_references.to_sentence}\n\n"
end
message << "#{description}\n\n" if include_description && description.present?