From 682eb7583499c4720422469ef4cd86fa48728263 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 3 Apr 2018 12:51:09 +0100 Subject: 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. --- app/mailers/emails/merge_requests.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/mailers') 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 -- cgit v1.2.1