diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-06 06:20:21 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-05-06 06:20:21 +0000 |
| commit | 91846578711c7f32fd5e26437b5c14c66f8156fb (patch) | |
| tree | 70755a2bd4ecbd12ff3962417a9151dfde559174 /app | |
| parent | f78cd577e5777605f0100d9a0e678b40cb133cde (diff) | |
| parent | 1dc906d5868d5ad1344a393ab51fd6d0116f14e5 (diff) | |
| download | gitlab-ce-91846578711c7f32fd5e26437b5c14c66f8156fb.tar.gz | |
Merge branch 'fix-devise-email-display-name' into 'master'
Use the configured display name in e-mails from Devise mailer
By default, it is set to "GitLab", but a user may configure the display name to something else.
See merge request !613
Diffstat (limited to 'app')
| -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 |