diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-21 11:27:23 -0300 |
| commit | f32c3709830eb8d9f68a59c94f6791621c2b52ac (patch) | |
| tree | b34cf0b9321dfd40b795cc761b158be4cbde48f6 /activemodel/lib/active_model.rb | |
| parent | 9a28bd787660b08aae36155066e61d3608d0b4dd (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.gz rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.tar.bz2 rails-f32c3709830eb8d9f68a59c94f6791621c2b52ac.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activemodel/lib/active_model.rb')
| -rw-r--r-- | activemodel/lib/active_model.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index c6f63d2fdc..2de19597b1 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -26,9 +26,7 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support' module ActiveModel - autoload :APICompliant, 'active_model/api_compliant' - autoload :Attributes, 'active_model/attributes' - autoload :Base, 'active_model/base' + autoload :Conversion, 'active_model/conversion' autoload :DeprecatedErrorMethods, 'active_model/deprecated_error_methods' autoload :Errors, 'active_model/errors' autoload :Name, 'active_model/naming' |