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/devise_mailer.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/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 e4b65c19b3f..b616add283a 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.outgoing_emails.display_name} <#{Gitlab.config.outgoing_emails.from}>" - default reply_to: Gitlab.config.outgoing_emails.reply_to + default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>" + default reply_to: Gitlab.config.gitlab.email_reply_to end |