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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #14573 from habermann24/has_many_through_fix	Rafael Mendonça França	2014-04-22	1	-0/+2
\|\
\| *	Properly handle scoping with has_many :through. Fixes #14537.	Jan Habermann	2014-04-03	1	-0/+2
\|/
*	Prevent Relation#merge from collapsing wheres on the RHS	Jon Leighton	2013-01-27	1	-0/+1
*	Remove mass assignment security from ActiveRecord	Guillermo Iguaran	2012-09-16	1	-2/+0
*	Add a test to make sure preloading properly merges association and default sc...	Pratik Naik	2012-08-28	1	-0/+8
*	Not need to pass join attributes to association build	Rafael Mendonça França	2012-03-07	1	-0/+9
*	Allow building and then later saving has_many :through records, such that the...	Jon Leighton	2011-02-18	1	-1/+2
*	move assets and models	Jeremy Kemper	2008-01-18	1	-0/+4