diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-01-13 23:42:07 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-01-16 21:17:17 +0000 |
| commit | d13627d532f23b248a9141511c16abdf5746a486 (patch) | |
| tree | b307474e4ba22771acaedf9cba0a237e2219aad4 /activerecord/lib/active_record/associations/builder | |
| parent | 247d274cabae827766c1c5b9deb34fb34548fc5e (diff) | |
| download | rails-d13627d532f23b248a9141511c16abdf5746a486.tar.gz rails-d13627d532f23b248a9141511c16abdf5746a486.tar.bz2 rails-d13627d532f23b248a9141511c16abdf5746a486.zip | |
Revert "Deprecate implicit eager loading. Closes #950."
This reverts commit c99d507fccca2e9e4d12e49b4387e007c5481ae9.
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 776f0d0469..d4f59100e8 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -1,7 +1,7 @@ module ActiveRecord::Associations::Builder class Association #:nodoc: class_attribute :valid_options - self.valid_options = [:class_name, :foreign_key, :select, :conditions, :include, :eager_load, :extend, :readonly, :validate] + self.valid_options = [:class_name, :foreign_key, :select, :conditions, :include, :extend, :readonly, :validate] # Set by subclasses class_attribute :macro |