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 /config/initializers/devise.rb | |
| 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 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 9dce495106f..8f8c4169740 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -2,13 +2,8 @@ # four configuration values can also be set straight in your models. 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 <#{Gitlab.config.gitlab.email_from}>" - - # Configure the class responsible to send e-mails. - # config.mailer = "Devise::Mailer" + config.mailer = "DeviseMailer" # ==> ORM configuration # Load and configure the ORM. Supports :active_record (default) and |