kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2022-09-10 15:10:14 +00:00
parent d25aca9c3a
commit b8f2bd7587
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/notify/push_to_merge_request_email.html.haml
View file

@ -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

5
locale/gitlab.pot
View file

@ -72,11 +72,6 @@ msgstr ""
msgid "\"%{repository_name}\" size (%{repository_size}) is larger than the limit of %{limit}."
msgstr ""
msgid "#%d commit"
msgid_plural "#%d commits"
msgstr[0] ""
msgstr[1] ""
msgid "#%{issueIid} (closed)"
msgstr ""