diff options
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 15d482bf2c..01bcc9a2d7 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] + * Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com] * Resolve action naming collision. #5520 [ssinghi@kreeti.com] diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d667ef1f4b..873eb3c9c9 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -187,7 +187,7 @@ module ActionMailer #:nodoc: # Action Mailer subclasses should be reloaded by the dispatcher in Rails # when Dependencies.mechanism = :load. - include Reloadable::Subclasses + include Reloadable::Deprecated private_class_method :new #:nodoc: |