aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency.rb
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-051-1/+1
* Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-041-1/+1
* fix associations when using per class databasesLars Kanis2012-02-101-1/+1
* reintroduce patch from #726 to handle nested eager loading via associationsJay Levitt2011-11-301-1/+1
* Ensure empty has_many :through association preloaded via joins is marked as l...Jon Leighton2011-08-151-3/+2
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-24/+8
* Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-281-0/+231