diff options
Diffstat (limited to 'app/views/notify/merge_request_unmergeable_email.html.haml')
| -rw-r--r-- | app/views/notify/merge_request_unmergeable_email.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/merge_request_unmergeable_email.html.haml b/app/views/notify/merge_request_unmergeable_email.html.haml index fddf9eaf95a..6bcff28985c 100644 --- a/app/views/notify/merge_request_unmergeable_email.html.haml +++ b/app/views/notify/merge_request_unmergeable_email.html.haml @@ -1,2 +1,2 @@ %p - Merge request #{merge_request_reference_link(@merge_request)} can no longer be merged due to conflict. + = sprintf(s_('Notify|Merge request %{merge_request} can no longer be merged due to conflict.'), { merge_request: merge_request_reference_link(@merge_request) }).html_safe |