diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-07 22:37:32 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-07 23:43:40 -0700 |
| commit | 47b1528abe69f9b584536a3557f23d912b0ecfd8 (patch) | |
| tree | 8236e924a12e66e932f287518f9337390398d522 /app/views/notify | |
| parent | dd552d06f6e39d5e6138a33bd7c1bffb2d3dbb1d (diff) | |
| download | gitlab-ce-47b1528abe69f9b584536a3557f23d912b0ecfd8.tar.gz | |
Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152
An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.
Closes #45152
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.text.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/push_to_merge_request_email.html.haml b/app/views/notify/push_to_merge_request_email.html.haml index 4c507c08ed7..67744ec1cee 100644 --- a/app/views/notify/push_to_merge_request_email.html.haml +++ b/app/views/notify/push_to_merge_request_email.html.haml @@ -7,7 +7,7 @@ - count = @existing_commits.size %ul %li - - if count.one? + - if count == 1 - commit_id = @existing_commits.first[:short_id] = link_to(commit_id, project_commit_url(@merge_request.target_project, commit_id)) - else 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}` |