diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:39:18 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 17:39:18 +0300 |
commit | 317ed1fa9034eba91af95b2e98a3576497cbaf3a (patch) | |
tree | 5aecfc4a32e2a784211cfc1fa3d37b49ca791f66 /app/mailers/notify.rb | |
parent | 86ec49add45d95f67fda749758d07a26ee030989 (diff) | |
download | gitlab-ce-317ed1fa9034eba91af95b2e98a3576497cbaf3a.tar.gz |
Revert "Allow to configure smtp and sendmail in gitlab.yml"
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 a9800f7f103..79fb48b00d3 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.outgoing_emails.reply_to + default reply_to: Gitlab.config.gitlab.email_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 - Mail::Address.new(Gitlab.config.outgoing_emails.from).tap do |address| - address.display_name = Gitlab.config.outgoing_emails.display_name - end + address = Mail::Address.new(Gitlab.config.gitlab.email_from) + address.display_name = Gitlab.config.gitlab.email_display_name + address end def can_send_from_user_email?(sender) |