diff options
author | Stan Hu <stanhu@gmail.com> | 2015-05-05 19:54:21 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-05-05 19:54:21 -0700 |
commit | 1dc906d5868d5ad1344a393ab51fd6d0116f14e5 (patch) | |
tree | 09b5a9940c4c436c525e5d63e1f1967aa223d5a6 /app/mailers | |
parent | 5bff135fb3dbd1af855f8cd94b4bed76d2cbc42e (diff) | |
download | gitlab-ce-1dc906d5868d5ad1344a393ab51fd6d0116f14e5.tar.gz |
Use the configured display name in e-mails from Devise mailer
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/devise_mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index 5395fe16414..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 <#{Gitlab.config.gitlab.email_from}>" + default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>" default reply_to: Gitlab.config.gitlab.email_reply_to end |