diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-05-02 17:48:30 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-05-02 17:48:30 +0000 |
| commit | 703856c75ee7eefbfb536db306eaeec4c4b35e02 (patch) | |
| tree | 1da39f24a91d9e3015efe5cef52b9c7671712a92 /app | |
| parent | cfbff017d0ba1ba4fd896b4762b23853f123c60a (diff) | |
| parent | 4dda17a5bfe93e06f416fd4e33d487daee41731e (diff) | |
| download | gitlab-ce-703856c75ee7eefbfb536db306eaeec4c4b35e02.tar.gz | |
Merge branch 'make-reply-to-work-everywhere' into 'master'
Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise
Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.
The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.
Closes #1556
See merge request !596
Diffstat (limited to 'app')
| -rw-r--r-- | app/mailers/devise_mailer.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb new file mode 100644 index 00000000000..5395fe16414 --- /dev/null +++ b/app/mailers/devise_mailer.rb @@ -0,0 +1,4 @@ +class DeviseMailer < Devise::Mailer + default from: "GitLab <#{Gitlab.config.gitlab.email_from}>" + default reply_to: Gitlab.config.gitlab.email_reply_to +end |