diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 21:07:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 21:07:52 +0300 |
commit | 6c15c18fa455502bf0b80316390eefde40d42a8a (patch) | |
tree | b42af022a747fd580a09f36b0e60a9f53ed7b25c /app/mailers/emails/projects.rb | |
parent | 263f926c770163788f78af03ab69689c94f57360 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/emails/projects.rb')
-rw-r--r-- | app/mailers/emails/projects.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index 6274879ee99..5c957437039 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -51,7 +51,7 @@ module Emails add_project_headers headers['X-GitLab-Author'] = @message.author_username - mail(from: sender(@message.author_id, @message.send_from_committer_email?), + mail(from: sender(@message.author_id, send_from_user_email: @message.send_from_committer_email?), reply_to: @message.reply_to, subject: @message.subject) end |