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 /activerecord/lib/active_record/attribute_methods | |
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 'activerecord/lib/active_record/attribute_methods')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/query.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index a8698a2f5a..435aea9b09 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/blank' + module ActiveRecord module AttributeMethods module Dirty diff --git a/activerecord/lib/active_record/attribute_methods/query.rb b/activerecord/lib/active_record/attribute_methods/query.rb index a949d80120..948809c65a 100644 --- a/activerecord/lib/active_record/attribute_methods/query.rb +++ b/activerecord/lib/active_record/attribute_methods/query.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/blank' + module ActiveRecord module AttributeMethods module Query |