diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-03 14:51:09 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-03 15:22:25 +0300 |
| commit | 682eb7583499c4720422469ef4cd86fa48728263 (patch) | |
| tree | 65ffa84335ba25fca446b5fbf974a08a10bd8a16 /app/views/notify | |
| parent | 98278abd590198832c09445ee69df4df6cd006a2 (diff) | |
Fix body of email when commits are pushed to an MR
This was sending the current user, which is the recipient! It should be the user
who pushed the commits.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notify/push_to_merge_request_email.text.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/push_to_merge_request_email.html.haml b/app/views/notify/push_to_merge_request_email.html.haml index 5cc6f21c0f3..4c507c08ed7 100644 --- a/app/views/notify/push_to_merge_request_email.html.haml +++ b/app/views/notify/push_to_merge_request_email.html.haml @@ -1,7 +1,7 @@ %h3 - New commits were pushed to the merge request + = @updated_by_user.name + pushed new commits to merge request = link_to(@merge_request.to_reference, project_merge_request_url(@merge_request.target_project, @merge_request)) - by #{@current_user.name} - if @existing_commits.any? - count = @existing_commits.size diff --git a/app/views/notify/push_to_merge_request_email.text.haml b/app/views/notify/push_to_merge_request_email.text.haml index d7722e5f41f..553f771f1a6 100644 --- a/app/views/notify/push_to_merge_request_email.text.haml +++ b/app/views/notify/push_to_merge_request_email.text.haml @@ -1,4 +1,4 @@ -New commits were pushed to the merge request #{@merge_request.to_reference} by #{@current_user.name} +#{@updated_by_user.name} pushed new commits to merge request #{@merge_request.to_reference} \ #{url_for(project_merge_request_url(@merge_request.target_project, @merge_request))} \ |