Skip to content
代码片段 群组 项目
提交 31b36dcf 编辑于 作者: Doug Stull's avatar Doug Stull
浏览文件

Merge branch 'ps-fix-push-to-mr-email' into 'master'

Remove "#" from push_to_merge_request_email

See merge request gitlab-org/gitlab!97555
No related branches found
No related tags found
无相关合并请求
...@@ -13,7 +13,7 @@ ...@@ -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 = 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]} #{@existing_commits.first[:short_id]}...#{@existing_commits.last[:short_id]}
= precede ' - ' do = 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} = s_('Notify|%{commits_text} from branch `%{target_branch}`') % {commits_text: commits_text, target_branch: @merge_request.target_branch}
- if @total_new_commits_count > 0 - if @total_new_commits_count > 0
......
...@@ -72,11 +72,6 @@ msgstr "" ...@@ -72,11 +72,6 @@ msgstr ""
msgid "\"%{repository_name}\" size (%{repository_size}) is larger than the limit of %{limit}." msgid "\"%{repository_name}\" size (%{repository_size}) is larger than the limit of %{limit}."
msgstr "" msgstr ""
   
msgid "#%d commit"
msgid_plural "#%d commits"
msgstr[0] ""
msgstr[1] ""
msgid "#%{issueIid} (closed)" msgid "#%{issueIid} (closed)"
msgstr "" msgstr ""
   
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册