diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-05-01 17:12:54 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-05-01 22:57:10 -0700 |
| commit | 4dda17a5bfe93e06f416fd4e33d487daee41731e (patch) | |
| tree | 6101ee352ae4f9181813714ce9af2323d6c317ad /app | |
| parent | 001c9731e6c03a13699f1cb60e7fbe7f860e30ad (diff) | |
| download | gitlab-ce-4dda17a5bfe93e06f416fd4e33d487daee41731e.tar.gz | |
Make Reply-To config apply to change e-mail confirmation and other notifications
sent through Devise
Fix test case that was passing due to a broken `around` statement.
Closes #1556
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 |