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

Merge branch 'fix-devise-email-display-name' into 'master'
91846578 · Robert Schilling · f78cd577 · 1dc906d5 · 91846578
Commit 91846578 authored May 06, 2015 by Robert Schilling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

devise_mailer.rb app/mailers/devise_mailer.rb +1 -1

No files found.
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
 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