diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 18:10:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-30 18:10:47 +0000 |
commit | 1abf48c10ca3802db57bad00de3355586a6cc40e (patch) | |
tree | d027173e342f44e67528b6429c8f4b0b222efec6 /app/views/notify/closed_merge_request_email.text.haml | |
parent | 2cba3ab8e7b2d6b32be6910d15b53860f2c2140e (diff) | |
download | gitlab-ce-1abf48c10ca3802db57bad00de3355586a6cc40e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify/closed_merge_request_email.text.haml')
-rw-r--r-- | app/views/notify/closed_merge_request_email.text.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/closed_merge_request_email.text.haml b/app/views/notify/closed_merge_request_email.text.haml index 28766f861d9..942e771261a 100644 --- a/app/views/notify/closed_merge_request_email.text.haml +++ b/app/views/notify/closed_merge_request_email.text.haml @@ -1,6 +1,6 @@ -Merge Request #{@merge_request.to_reference} was closed by #{sanitize_name(@updated_by.name)} +Merge request #{@merge_request.to_reference} was closed by #{sanitize_name(@updated_by.name)} -Merge Request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} +Merge request URL: #{project_merge_request_url(@merge_request.target_project, @merge_request)} = merge_path_description(@merge_request, 'to') |