diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-10 18:10:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-10 18:10:14 +0300 |
| commit | b8f2bd7587f656a04f8489e235bae7c6bd93d11c (patch) | |
| tree | 996d086d6df6e5bfe7fc28a7b4dba79cc279f1e6 /app/views/notify | |
| parent | d25aca9c3a62754ecf465f43c7728b8a124bf092 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.html.haml | 2 |
1 files changed, 1 insertions, 1 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 fc32ceab765..16612cd43c5 100644 --- a/app/views/notify/push_to_merge_request_email.html.haml +++ b/app/views/notify/push_to_merge_request_email.html.haml @@ -13,7 +13,7 @@ = 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 = n_("#%d commit", "#%d commits", @total_existing_commits_count) % @total_existing_commits_count + - commits_text = n_("%d commit", "%d commits", @total_existing_commits_count) % @total_existing_commits_count = s_('Notify|%{commits_text} from branch `%{target_branch}`') % {commits_text: commits_text, target_branch: @merge_request.target_branch} - if @total_new_commits_count > 0 |