diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 18:13:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-06 18:13:23 +0300 |
| commit | b333706699e505b2a0a4fa9cc64b9d2358f271a5 (patch) | |
| tree | 8d7f450089b32bcf038269c5e2849887b45c212d /app/views | |
| parent | 65b6ccd12e2e440baafd88851470d032c6ebe2c5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/notify/resolved_all_discussions_email.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/notify/resolved_all_discussions_email.html.haml b/app/views/notify/resolved_all_discussions_email.html.haml index 209415e0aee..bd9778ae142 100644 --- a/app/views/notify/resolved_all_discussions_email.html.haml +++ b/app/views/notify/resolved_all_discussions_email.html.haml @@ -1,3 +1,2 @@ %p - All discussions on merge request #{merge_request_reference_link(@merge_request)} - were resolved by #{sanitize_name(@resolved_by.name)} + = s_('Notify|All discussions on merge request %{mr_link} were resolved by %{name}') %{mr_link: sanitize(merge_request_reference_link(@merge_request)), name: sanitize_name(@resolved_by.name)} |