Commit 91846578 authored by Robert Schilling's avatar Robert Schilling

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
parents f78cd577 1dc906d5
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment