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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-04	1	-0/+13
\|\
\| *	Fix creation of has_many through records with custom primary_key option on be...	Szymon Nowak	2010-12-23	1	-0/+1
\| *	Fix various issues with the :primary_key option in :through associations [#24...	Jon Leighton	2010-12-15	1	-0/+3
\| *	Verify that creating a has_many through record where there is a default_scope...	Jon Leighton	2010-12-16	1	-1/+10
* \|	Fix naughty trailing whitespace	Jon Leighton	2010-10-31	1	-1/+1
* \|	Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ...	Jon Leighton	2010-10-14	1	-1/+3
\|/
*	move assets and models	Jeremy Kemper	2008-01-18	1	-0/+5