diff options
Diffstat (limited to 'app/views/notify/merge_request_unmergeable_email.text.haml')
-rw-r--r-- | app/views/notify/merge_request_unmergeable_email.text.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/merge_request_unmergeable_email.text.haml b/app/views/notify/merge_request_unmergeable_email.text.haml index a23d083747c..3db5f21e6c2 100644 --- a/app/views/notify/merge_request_unmergeable_email.text.haml +++ b/app/views/notify/merge_request_unmergeable_email.text.haml @@ -1,6 +1,6 @@ -Merge Request #{@merge_request.to_reference} can no longer be merged due to conflict. +Merge request #{@merge_request.to_reference} can no longer be merged due to conflict. -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') |