diff options
| author | James Lopez <james@gitlab.com> | 2018-04-12 11:57:27 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2018-04-12 11:57:27 +0300 |
| commit | 63623dc7741a4680af17dd348319e1104f71a8c6 (patch) | |
| tree | 24586af26d80f56d06d8b432a22fa6bfa7cae8c0 /app/views/notify/push_to_merge_request_email.text.haml | |
| parent | c393a44f2fa5e161c8055bc589f10d4ee2e1d8a0 (diff) | |
| parent | 8e26fbfeff7fbd32879bfc530fb3eb5bcbd73a00 (diff) | |
Merge branch '10-7-stable-prepare-rc5' into '10-7-stable'
Prepare 10.7 RC5 release
See merge request gitlab-org/gitlab-ce!18308
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.haml | 2 |
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}` |