diff options
Diffstat (limited to 'app/views/notify/push_to_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.html.haml | 11 |
1 files changed, 6 insertions, 5 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 3e9f9b442e0..5197a1bdd08 100644 --- a/app/views/notify/push_to_merge_request_email.html.haml +++ b/app/views/notify/push_to_merge_request_email.html.haml @@ -3,24 +3,25 @@ pushed new commits to merge request = merge_request_reference_link(@merge_request) -- if @existing_commits.any? - - count = @existing_commits.size +- if @total_existing_commits_count > 0 %ul %li - - if count == 1 + - if @total_existing_commits_count == 1 - commit_id = @existing_commits.first[:short_id] = link_to(commit_id, project_commit_url(@merge_request.target_project, commit_id)) - else = link_to(project_compare_url(@merge_request.target_project, from: @existing_commits.first[:short_id], to: @existing_commits.last[:short_id])) do #{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]} = precede ' - ' do - - commits_text = "#{count} commit".pluralize(count) + - commits_text = "#{@total_existing_commits_count} commit".pluralize(@total_existing_commits_count) #{commits_text} from branch `#{@merge_request.target_branch}` -- if @new_commits.any? +- if @total_new_commits_count > 0 %ul - @new_commits.each do |commit| %li = link_to(commit[:short_id], project_commit_url(@merge_request.target_project, commit[:short_id])) = precede ' - ' do #{commit[:title]} + - if @total_stripped_new_commits_count > 0 + %li And #{@total_stripped_new_commits_count} more |