diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-28 18:09:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-28 18:09:03 +0000 |
commit | b420660ef1369fec4d09b7bf5e961d81980974e5 (patch) | |
tree | f096fdd1bd3b4898e1b2ca80957ce68c200c09f0 /app/views/notify/merged_merge_request_email.text.haml | |
parent | b8026fd558e7ec154c626208a33c1485aec8f4ea (diff) | |
download | gitlab-ce-b420660ef1369fec4d09b7bf5e961d81980974e5.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify/merged_merge_request_email.text.haml')
-rw-r--r-- | app/views/notify/merged_merge_request_email.text.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml index 9b9eb566903..b80e4606f35 100644 --- a/app/views/notify/merged_merge_request_email.text.haml +++ b/app/views/notify/merged_merge_request_email.text.haml @@ -2,7 +2,7 @@ = sprintf(s_('Notify|Merge request URL: %{merge_request_url}'), { merge_request_url: project_merge_request_url(@merge_request.target_project, @merge_request) }) -= merge_path_description(@merge_request, 'to') += merge_path_description(@merge_request) = sprintf(s_('Notify|Author: %{author_name}'), { author_name: sanitize_name(@merge_request.author_name) }) |