diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2015-02-15 01:28:50 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-06 13:15:33 +0200 |
| commit | b4be7aed7711e51becb3be29ed82d6753cc73cc4 (patch) | |
| tree | baa0f7c67124cdbcb072a6d3834bb9c66f9b0936 /app/mailers/devise_mailer.rb | |
| parent | 7af59c54fc1fcf9d19927e76be49318689684f8b (diff) | |
| download | gitlab-ce-b4be7aed7711e51becb3be29ed82d6753cc73cc4.tar.gz | |
Allow to configure smtp and sendmail in gitlab.yml
Diffstat (limited to 'app/mailers/devise_mailer.rb')
| -rw-r--r-- | app/mailers/devise_mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index b616add283a..e4b65c19b3f 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -1,4 +1,4 @@ class DeviseMailer < Devise::Mailer - default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>" - default reply_to: Gitlab.config.gitlab.email_reply_to + default from: "#{Gitlab.config.outgoing_emails.display_name} <#{Gitlab.config.outgoing_emails.from}>" + default reply_to: Gitlab.config.outgoing_emails.reply_to end |