aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-02-02 06:13:18 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-02-02 06:13:18 +0000
commit1129e5b915fe007257447c61ca77843fb06b4c56 (patch)
treee0cf0797f03c386ae819fe3e6d3c8be43f5e1b34 /activerecord
parent52b04e8e7417719128e0882cdd4356882af6556a (diff)
downloadrails-1129e5b915fe007257447c61ca77843fb06b4c56.tar.gz
rails-1129e5b915fe007257447c61ca77843fb06b4c56.tar.bz2
rails-1129e5b915fe007257447c61ca77843fb06b4c56.zip
Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rwxr-xr-xactiverecord/lib/active_record/base.rb8
2 files changed, 2 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 8c2c7ad9cc..bb56988f98 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. [Nicholas Seckar]
+
* Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [shugo@ruby-lang.org]
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index aa13dc6d68..81791201b4 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -251,14 +251,6 @@ module ActiveRecord #:nodoc:
super
end
- # Allow all subclasses of AR::Base to be reloaded in dev mode, unless they
- # explicitly decline the honor. USE WITH CAUTION. Only AR subclasses kept
- # in the framework should use the flag, so #reset_subclasses and so forth
- # leave it alone.
- def self.reloadable? #:nodoc:
- true
- end
-
def self.reset_subclasses
nonreloadables = []
subclasses.each do |klass|