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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'rails/master'	Emilio Tagua	2009-08-10	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/calculations.rb activerecord/lib/active_record/connection_adapters/mysql_adapter.rb activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
\| *	Enable has_many :through for going through a has_one association on the join ↵	Gabe da Silveira	2009-08-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	model [#2719 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* \|	Merge commit 'rails/master'	Emilio Tagua	2009-06-23	1	-0/+7
\|\\|
\| *	Ensure hm:t#create respects source associations hash conditions [#2090 ↵	mattbauer	2009-06-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* \|	Leave the quoting part to ARel	Emilio Tagua	2009-06-12	1	-1/+1
\|/
*	HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.	Adam Milligan	2009-06-12	1	-0/+147
	[#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>