diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /activemodel/lib/active_model.rb | |
parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'activemodel/lib/active_model.rb')
-rw-r--r-- | activemodel/lib/active_model.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb index f14016027c..6eab00c177 100644 --- a/activemodel/lib/active_model.rb +++ b/activemodel/lib/active_model.rb @@ -30,10 +30,12 @@ module ActiveModel extend ActiveSupport::Autoload autoload :AttributeMethods + autoload :BlockValidator, 'active_model/validator' autoload :Callbacks autoload :Conversion autoload :DeprecatedErrorMethods autoload :Dirty + autoload :EachValidator, 'active_model/validator' autoload :Errors autoload :Lint autoload :Name, 'active_model/naming' @@ -42,12 +44,11 @@ module ActiveModel autoload :Observing autoload :Serialization autoload :StateMachine + autoload :TestCase autoload :Translation + autoload :VERSION autoload :Validations autoload :Validator - autoload :EachValidator, 'active_model/validator' - autoload :BlockValidator, 'active_model/validator' - autoload :VERSION module Serializers extend ActiveSupport::Autoload |