diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-14 18:15:44 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-14 18:15:44 +0000 |
| commit | 30fa7053be89de6a4615788862e052be925342c2 (patch) | |
| tree | 1e53ff64597c9c501497d6cc5ee5c257ce51105a /railties | |
| parent | 2ac4839050f28d78f49d073f0d24dc29dd3e0244 (diff) | |
| download | rails-30fa7053be89de6a4615788862e052be925342c2.tar.gz rails-30fa7053be89de6a4615788862e052be925342c2.tar.bz2 rails-30fa7053be89de6a4615788862e052be925342c2.zip | |
Add silencing to deprecations; avoid self-scolding.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4760 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |