diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
| commit | 7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d (patch) | |
| tree | 9e622391ee98e330c96f7e0938120633128f365e /activemodel | |
| parent | d1f3437cac77673bf00fd95c5a0b7c1676d70603 (diff) | |
| parent | c99194c7bed6744104e114ab231ef39158044a63 (diff) | |
| download | rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.gz rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.bz2 rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activemodel')
| -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 |