diff options
Diffstat (limited to 'app/mailers/notify.rb')
| -rw-r--r-- | app/mailers/notify.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 79fb48b00d3..a9800f7f103 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -17,7 +17,7 @@ class Notify < ActionMailer::Base helper_method :current_user, :can? default from: Proc.new { default_sender_address.format } - default reply_to: Gitlab.config.gitlab.email_reply_to + default reply_to: Gitlab.config.outgoing_emails.reply_to # Just send email with 2 seconds delay def self.delay @@ -50,9 +50,9 @@ class Notify < ActionMailer::Base # The default email address to send emails from def default_sender_address - address = Mail::Address.new(Gitlab.config.gitlab.email_from) - address.display_name = Gitlab.config.gitlab.email_display_name - address + Mail::Address.new(Gitlab.config.outgoing_emails.from).tap do |address| + address.display_name = Gitlab.config.outgoing_emails.display_name + end end def can_send_from_user_email?(sender) |