diff --git a/app/views/notify/changed_reviewer_of_merge_request_email.html.haml b/app/views/notify/changed_reviewer_of_merge_request_email.html.haml index f080a5798f1efd136ba0212c51df6282aaba4319..51042c3020a4e0a3984b4480fe1203996558a6b7 100644 --- a/app/views/notify/changed_reviewer_of_merge_request_email.html.haml +++ b/app/views/notify/changed_reviewer_of_merge_request_email.html.haml @@ -1,4 +1,4 @@ = render_if_exists 'notify/address_new_reviewer_with_diff_summary' %p - = change_reviewer_notification_text(@merge_request.reviewers, @previous_reviewers, :strong) + = change_reviewer_notification_text(@merge_request.reviewers, @previous_reviewers) diff --git a/app/views/notify/request_review_merge_request_email.html.haml b/app/views/notify/request_review_merge_request_email.html.haml index d5f5d155f3d2b12b02c16ee48f3da99c509429f5..d0459af8b5690d26decf6e9536e2fae61d5fc114 100644 --- a/app/views/notify/request_review_merge_request_email.html.haml +++ b/app/views/notify/request_review_merge_request_email.html.haml @@ -1,3 +1,11 @@ -%p - = html_escape(s_('Notify|%{name} requested a new review on %{mr_link}.')) % {name: sanitize_name(@updated_by.name), mr_link: merge_request_reference_link(@merge_request).html_safe} +- long_mr = '%{reference} %{mrtitle}' % { reference: @merge_request.to_reference, mrtitle: @merge_request.title } +- mr_url = merge_request_url(@merge_request) + +%h4{ style: 'margin-bottom: 0' } + = s_('Notify|Review requested') +%p{ style: 'margin-top: 0' } + = html_escape(s_('Notify|You were added as a reviewer on %{long_mr} by %{name}.')) % {name: sanitize_name(@updated_by.name), long_mr: long_mr} = render_if_exists 'notify/diff_summary' +%p + %a{ href: mr_url, target: "_blank", rel: "noopener noreferrer nofollow", style: "-webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-size: 14px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; color: #ffffff; text-decoration: none; border-radius: 4px; -webkit-border-radius: 4px; background-color: #1f75cb; display: inline-block; padding: 8px 12px; box-shadow: inset 0 0 0 1px #1068bf" } + = s_('Notify|Review changes') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e6b6caeea48e4fd4bd52ec9ff487a664ac1a0933..447b0b8b1d0b5644a335bf5b4d7ab5275cc8af1b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -33502,6 +33502,12 @@ msgstr "" msgid "Notify|Remote mirror" msgstr "" +msgid "Notify|Review changes" +msgstr "" + +msgid "Notify|Review requested" +msgstr "" + msgid "Notify|SMTP host issue:" msgstr "" @@ -33595,6 +33601,9 @@ msgstr "" msgid "Notify|You have been unsubscribed from receiving GitLab administrator notifications." msgstr "" +msgid "Notify|You were added as a reviewer on %{long_mr} by %{name}." +msgstr "" + msgid "Notify|Your CSV import for project %{project_link} has been completed." msgstr ""