diff options
| author | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-28 11:06:46 -0700 |
| commit | c99194c7bed6744104e114ab231ef39158044a63 (patch) | |
| tree | 9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /activemodel/lib | |
| parent | 835f5d0269a8d3615585119e77f1ba7d601c943b (diff) | |
| parent | f1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff) | |
| download | rails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2 rails-c99194c7bed6744104e114ab231ef39158044a63.zip | |
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/dirty.rb | 3 | ||||
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validator.rb | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb index cb67ef7270..2d5acdfced 100644 --- a/activemodel/lib/active_model/dirty.rb +++ b/activemodel/lib/active_model/dirty.rb @@ -1,4 +1,7 @@ +require 'active_model/attribute_methods' +require 'active_support/concern' require 'active_support/hash_with_indifferent_access' +require 'active_support/core_ext/object/duplicable' module ActiveModel # <tt>ActiveModel::Dirty</tt> provides a way to track changes in your diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index a9a54a90e0..8d28040c32 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/string/inflections' +require 'active_support/core_ext/object/blank' require 'active_support/ordered_hash' module ActiveModel diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb index b7c52be3f0..906d239bcc 100644 --- a/activemodel/lib/active_model/validator.rb +++ b/activemodel/lib/active_model/validator.rb @@ -1,5 +1,6 @@ require 'active_support/core_ext/array/wrap' require "active_support/core_ext/module/anonymous" +require 'active_support/core_ext/object/blank' module ActiveModel #:nodoc: # A simple base class that can be used along with |