diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 15:59:21 +0300 |
| commit | 86ec49add45d95f67fda749758d07a26ee030989 (patch) | |
| tree | 1c2009ae71ffddb78538cdd8e608fc795d6f596d /app/mailers/devise_mailer.rb | |
| parent | 3f2282300d9c97e8c0c1df955bdd13d7ee1dc96e (diff) | |
| parent | b4be7aed7711e51becb3be29ed82d6753cc73cc4 (diff) | |
| download | gitlab-ce-86ec49add45d95f67fda749758d07a26ee030989.tar.gz | |
Merge pull request #8800 from jirutka/email-settings
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 |