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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-04-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: guides/source/action_mailer_basics.md
\| *	JoinPart is no longer an abstract class	Neeraj Singh	2013-04-08	1	-1/+1
\| \|
* \|	changed variable name active_record => base_klass	Neeraj Singh	2013-04-09	1	-5/+5
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current code stores the klass name in active_record and this is used throughout. While reviewing the code time and again I had the mental picture of active_record being an instance of a klass. However here the actual klass is being stored in @active_record. Secondly at two different places while referring to @active_record the comment refers to it as base klass. All this points to active_record being not the best variable name. So I thought it is better to replace active_record with base_klass. This change is confined to JoinDependency, JoinBase, JoinPart and JoinAssociation - all joining related work.
*	No need to send public methods	Akira Matsuda	2013-02-26	1	-1/+1
\|
*	Fix eagerly loading associations without primary keys	Kelley Reynolds	2012-02-09	1	-1/+1
\|
*	TableAlias leg ordering has changed, so change accordingly	Aaron Patterson	2011-03-30	1	-1/+1
\|
*	Move JoinDependency and friends from ↵	Jon Leighton	2011-02-28	1	-0/+78
	ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations