diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-15 19:52:26 +0530 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-31 16:52:48 +0100 |
| commit | 08c1989b0dcbf41410cd1bfc0fbfa5d79df2aedf (patch) | |
| tree | 61d0166b1f3164eff76aeed258eb3eca609d8267 /app/views/notify/merge_request_status_email.text.haml | |
| parent | 35b8f103a87811e0a825773aad3e3d04ee85fa9e (diff) | |
| download | gitlab-ce-08c1989b0dcbf41410cd1bfc0fbfa5d79df2aedf.tar.gz | |
Use `sanitize_name` to sanitize URL in user full name
Diffstat (limited to 'app/views/notify/merge_request_status_email.text.haml')
| -rw-r--r-- | app/views/notify/merge_request_status_email.text.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/merge_request_status_email.text.haml b/app/views/notify/merge_request_status_email.text.haml index ae2a2933865..b9b9e0c3ad7 100644 --- a/app/views/notify/merge_request_status_email.text.haml +++ b/app/views/notify/merge_request_status_email.text.haml @@ -1,8 +1,8 @@ -Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{@updated_by.name} +Merge Request #{@merge_request.to_reference} was #{@mr_status} by #{sanitize_name(@updated_by.name)} Merge Request url: #{project_merge_request_url(@merge_request.target_project, @merge_request)} = merge_path_description(@merge_request, 'to') -Author: #{@merge_request.author_name} -Assignee: #{@merge_request.assignee_name} +Author: #{sanitize_name(@merge_request.author_name)} +Assignee: #{sanitize_name(@merge_request.assignee_name)} |