diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-03 12:51:09 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-03 13:22:25 +0100 |
| commit | 682eb7583499c4720422469ef4cd86fa48728263 (patch) | |
| tree | 65ffa84335ba25fca446b5fbf974a08a10bd8a16 /app/mailers | |
| parent | 98278abd590198832c09445ee69df4df6cd006a2 (diff) | |
| download | gitlab-ce-682eb7583499c4720422469ef4cd86fa48728263.tar.gz | |
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/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index be99f3780cc..b3f2aeb08ca 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -15,6 +15,7 @@ module Emails setup_merge_request_mail(merge_request_id, recipient_id) @new_commits = new_commits @existing_commits = existing_commits + @updated_by_user = User.find(updated_by_user_id) mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) end |