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

	Commit message (Expand)	Author	Age	Files	Lines
*	While merging relations preserve context for joins	Jared Armstrong and Neeraj Singh	2013-04-10	1	-1/+6
*	changed variable name active_record => base_klass	Neeraj Singh	2013-04-09	1	-1/+1
*	not a relation. it's an arel select manager	Neeraj Singh	2013-04-02	1	-4/+4
*	Represent association scope options as AR::Relations insternally.	Jon Leighton	2012-07-13	1	-18/+15
*	Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...	Jon Leighton	2012-05-05	1	-6/+1
*	Allow ActiveRecord::Relation merges to maintain context of joined associations	Jared Armstrong	2012-05-04	1	-1/+6
*	Avoid sanitize_sql when we can use Relation#where instead	Jon Leighton	2012-01-16	1	-2/+5
*	Fix problem with loading polymorphic associations which have been defined in ...	Jon Leighton	2011-05-22	1	-3/+7
*	Add join conditions to JOIN clause, not WHERE	Ernie Miller	2011-05-05	1	-3/+3
*	Extract the constraint-building for joins in JoinAssociation into a separate ...	Jon Leighton	2011-04-14	1	-8/+14
*	Fix tests under postgres - we should always put conditions in the WHERE part ...	Jon Leighton	2011-03-12	1	-8/+11
*	Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...	Jon Leighton	2011-03-11	1	-53/+12
*	Refactor JoinAssociation	Jon Leighton	2011-03-10	1	-100/+54
*	Rename Reflection#through_reflection_chain and #through_options to Reflection...	Jon Leighton	2011-03-10	1	-9/+7
*	Use Base#type_condition in JoinAssociation	Jon Leighton	2011-03-05	1	-15/+4
*	Push source_type and polymorphic conditions out of ThroughAssociation and Joi...	Jon Leighton	2011-03-05	1	-18/+0
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-04	1	-177/+157
*	Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...	Jon Leighton	2011-02-28	1	-0/+279