Renamed mail_sender to mailer_sender.
This commit is contained in:
parent
1db50dee36
commit
0c088a7420
|
@ -1,3 +1,6 @@
|
|||
* deprecations
|
||||
* Renamed mail_sender to mailer_sender
|
||||
|
||||
* enhancements
|
||||
* skip_before_filter added in Devise controllers
|
||||
* Use home_or_root_path on require_no_authentication as well
|
||||
|
|
|
@ -16,7 +16,7 @@ Devise.setup do |config|
|
|||
# config.remember_for = 2.weeks
|
||||
|
||||
# Configure the e-mail address which will be shown in DeviseMailer.
|
||||
# config.mail_sender = "foo.bar@yourapp.com"
|
||||
# config.mailer_sender = "foo.bar@yourapp.com"
|
||||
|
||||
# If you want to use other strategies, that are not (yet) supported by Devise,
|
||||
# you can configure them inside the config.warden block. The example below
|
||||
|
|
|
@ -21,11 +21,16 @@ module Devise
|
|||
yield self
|
||||
end
|
||||
|
||||
# Sets the sender in DeviseMailer.
|
||||
def mail_sender=(value)
|
||||
def mail_sender=(value) #:nodoc:
|
||||
ActiveSupport::Deprecation.warn "Devise.mail_sender= is deprecated, use Devise.mailer_sender instead"
|
||||
DeviseMailer.sender = value
|
||||
end
|
||||
alias :sender= :mail_sender=
|
||||
|
||||
# Sets the sender in DeviseMailer.
|
||||
def mailer_sender=(value)
|
||||
DeviseMailer.sender = value
|
||||
end
|
||||
alias :sender= :mailer_sender=
|
||||
|
||||
# Sets warden configuration using a block that will be invoked on warden
|
||||
# initialization.
|
||||
|
|
|
@ -27,7 +27,7 @@ class DeviseTest < ActiveSupport::TestCase
|
|||
test 'DeviseMailer.sender can be configured through Devise' do
|
||||
swap DeviseMailer, :sender => "foo@bar" do
|
||||
assert_equal "foo@bar", DeviseMailer.sender
|
||||
Devise.mail_sender = "bar@foo"
|
||||
Devise.mailer_sender = "bar@foo"
|
||||
assert_equal "bar@foo", DeviseMailer.sender
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue