summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorGabriel Gizotti <gabriel@gizotti.com>2016-12-13 23:00:00 +1000
committerGabriel Gizotti <gabriel@gizotti.com>2016-12-16 19:15:07 +1000
commit3e3d6b53dcdc50bbe45c4b3ff43faf3d2728f72c (patch)
tree2779e96846290041ee69ce91edc1bd2c9ef32d82 /app/models/merge_request.rb
parentf3378630c15d43080d2bda03f5165653092a660b (diff)
downloadgitlab-ce-3e3d6b53dcdc50bbe45c4b3ff43faf3d2728f72c.tar.gz
Change closes issues reference text on MergeRequest#merge_commit_message to match existing text generated by the system
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index acaf14a12e9..b7c775777c7 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -636,8 +636,7 @@ class MergeRequest < ActiveRecord::Base
]
if !include_description && closes_issues_references.present?
- issue_text = 'issue'.pluralize(closes_issues_references.size)
- message << "Closes #{issue_text} #{closes_issues_references.to_sentence}"
+ message << "Closes #{closes_issues_references.to_sentence}"
end
message << "#{description}" if include_description && description.present?