summaryrefslogtreecommitdiff
path: root/config/initializers/devise.rb
diff options
context:
space:
mode:
authorPierre de La Morinerie <pierre@capitainetrain.com>2014-02-17 18:49:42 +0100
committerPierre de La Morinerie <pierre@capitainetrain.com>2014-02-19 18:25:18 +0100
commit96dded3ec8401e9832b3888338f37c846bd43583 (patch)
treeae782ede2d7b2668c7cc659a1ebb03b086916502 /config/initializers/devise.rb
parent57cb1ca7917f27f2c7500858fb66d53b3ea49783 (diff)
downloadgitlab-ce-96dded3ec8401e9832b3888338f37c846bd43583.tar.gz
Send emails from the author
This changes the email "From" field from "gitlab@example.com" to either: * "John Doe <gitlab@example.com>" if the author of the action is known, * "GitLab <gitlab@example.com>" otherwise. Rationale: this allow mails to appear as if they were sent by the author. It appears in the mailbox more like a real discussion between the sender and the receiver ("John sent: we should refactor this") and less like a robot notifying about something.
Diffstat (limited to 'config/initializers/devise.rb')
-rw-r--r--config/initializers/devise.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a02bf9d4aec..50669ece7a8 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,7 +4,7 @@ Devise.setup do |config|
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
- config.mailer_sender = Gitlab.config.gitlab.email_from
+ config.mailer_sender = "GitLab <#{Gitlab.config.gitlab.email_from}>"
# Configure the class responsible to send e-mails.