gitlab-org--gitlab-foss/app/views/notify/push_to_merge_request_email.text.haml
Stan Hu 47b1528abe Fix undefined method one? when pushing to an existing merge request
An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.

Closes #45152
2018-04-07 23:43:40 -07:00

13 lines
610 B
Text

#{@updated_by_user.name} pushed new commits to merge request #{@merge_request.to_reference}
\
#{url_for(project_merge_request_url(@merge_request.target_project, @merge_request))}
\
- if @existing_commits.any?
- count = @existing_commits.size
- 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}`
\
- @new_commits.each do |commit|
* #{commit[:short_id]} - #{raw commit[:title]}