diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 8bf2fafd6e..294e961f28 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't warn dispatcher of Reloadable deprecations. [Nicholas Seckar] + * Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base [Rick Olson] ActiveRecord::Base.reset_subclasses is called before Dependencies are cleared and classes removed. diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 17e5ae74f7..78f2d9fe43 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -56,7 +56,9 @@ class Dispatcher def reset_application! ActiveRecord::Base.reset_subclasses if defined?(ActiveRecord) Dependencies.clear - Class.remove_class(*Reloadable.reloadable_classes) + ActiveSupport::Deprecation.silence do # TODO: Remove after 1.2 + Class.remove_class(*Reloadable.reloadable_classes) + end end |