diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-10 10:25:59 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-10 10:25:59 +0000 |
| commit | 33a4439e8f079303fcf7c71267936e5c8f694958 (patch) | |
| tree | 828c3c6dc55058e95927d36a3a03db9fd0263766 /app/mailers | |
| parent | 2db218f8bf186c509c927ce3e9d0502fee4f8349 (diff) | |
| parent | 174950b6562226beed7eef135a2450bfee60e21f (diff) | |
| download | gitlab-ce-33a4439e8f079303fcf7c71267936e5c8f694958.tar.gz | |
Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'
# Conflicts:
# db/schema.rb
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 |