diff options
author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
---|---|---|
committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
commit | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch) | |
tree | 024158d20563f34cca52a00b42aaa6c922777559 /actionmailer | |
parent | 94a1309194fa5962e33d395ede14e94b237c54f5 (diff) | |
download | rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2 rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip |
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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: |