summaryrefslogtreecommitdiff
path: root/app/views/notify/push_to_merge_request_email.text.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/notify/push_to_merge_request_email.text.haml')
-rw-r--r--app/views/notify/push_to_merge_request_email.text.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/push_to_merge_request_email.text.haml b/app/views/notify/push_to_merge_request_email.text.haml
index 553f771f1a6..95759d127e2 100644
--- a/app/views/notify/push_to_merge_request_email.text.haml
+++ b/app/views/notify/push_to_merge_request_email.text.haml
@@ -4,7 +4,7 @@
\
- if @existing_commits.any?
- count = @existing_commits.size
- - commits_id = count.one? ? @existing_commits.first[:short_id] : "#{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]}"
+ - commits_id = count == 1 ? @existing_commits.first[:short_id] : "#{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]}"
- commits_text = "#{count} commit".pluralize(count)
* #{commits_id} - #{commits_text} from branch `#{@merge_request.target_branch}`