rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Resolve some TODO comments which I decided did not need anything done	Jon Leighton	2011-03-12	1	-1/+1
\|
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-04	1	-24/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-12-12	1	-13/+21
\| \| \| \| \| \| \| \|	Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb
*	Fix naughty trailing whitespace	Jon Leighton	2010-10-31	1	-13/+13
\|
*	Some small tweaks on the last commit	Jon Leighton	2010-10-12	1	-2/+7
\|
*	Extract aliasing code from JoinDependency and JoinAssociation into a ↵	Jon Leighton	2010-10-12	1	-0/+68
	separate AliasTracker class. This can then be used by ThroughAssociationScope as well.