aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorJames Golick <jamesgolick@gmail.com>2013-04-02 15:15:22 -0700
committerJames Golick <jamesgolick@gmail.com>2013-04-02 15:16:04 -0700
commit22417c2112336b14a21a91819537bd951c15ee60 (patch)
tree20f522c18a74c8bce8288a30e850c911811bcc9a /activerecord/lib/active_record/relation.rb
parentc959798571b4060b19712e022f4236d75b2b7cfd (diff)
downloadrails-22417c2112336b14a21a91819537bd951c15ee60.tar.gz
rails-22417c2112336b14a21a91819537bd951c15ee60.tar.bz2
rails-22417c2112336b14a21a91819537bd951c15ee60.zip
Refactor CollectionProxy#scope to avoid calling #extend.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index c7b6c715f5..56462d355b 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -17,7 +17,7 @@ module ActiveRecord
include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation
attr_reader :table, :klass, :loaded
- attr_accessor :default_scoped
+ attr_accessor :default_scoped, :proxy_association
alias :model :klass
alias :loaded? :loaded
alias :default_scoped? :default_scoped