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

	Commit message (Expand)	Author	Age	Files	Lines
*	oracle, y u defy me	Jon Leighton	2011-03-16	1	-4/+4
*	Add a test for STI on the through where the through is nested, and change the...	Jon Leighton	2011-03-05	1	-0/+1
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-04	1	-2/+33
\|\
\| *	Allow building and then later saving has_many :through records, such that the...	Jon Leighton	2011-02-18	1	-0/+1
\| *	Ensure that association_ids uses the correct attribute where the association ...	Jon Leighton	2011-02-18	1	-0/+1
\| *	Add interpolation of association conditions back in, in the form of proc { .....	Jon Leighton	2011-02-14	1	-0/+7
\| *	Correctly update counter caches on deletion for has_many :through [#2824 stat...	Jon Leighton	2011-02-07	1	-0/+5
\| *	Let AssociationCollection#find use #scoped to do its finding. Note that I am ...	Jon Leighton	2011-01-03	1	-1/+1
\| *	removing SQL interpolation, please use scoping and attribute conditionals as ...	Aaron Patterson	2010-12-22	1	-3/+0
\| *	has_many associations with :dependent => :delete_all should update the counte...	Jon Leighton	2010-12-20	1	-0/+2
\| *	Fix problem where wrong keys are used in JoinAssociation when an association ...	Jon Leighton	2010-12-20	1	-0/+1
\| *	Fix various issues with the :primary_key option in :through associations [#24...	Jon Leighton	2010-12-15	1	-0/+10
\| *	Respect the default_scope on a join model when reading a through association	Jon Leighton	2010-12-16	1	-0/+7
* \|	Fix naughty trailing whitespace	Jon Leighton	2010-10-31	1	-2/+2
* \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-28	1	-0/+6
\|\\|
\| *	Allow default_scope to accept a Proc.	Tim Morgan	2010-10-19	1	-0/+6
* \|	Add explicit tests for the nested through association changes in reflection.rb	Jon Leighton	2010-10-19	1	-0/+1
* \|	Properly support conditions on any of the reflections involved in a nested th...	Jon Leighton	2010-10-19	1	-0/+5
* \|	Add support for nested through associations in JoinAssociation. Hence Foo.joi...	Jon Leighton	2010-10-09	1	-0/+2
\|/
*	Deletes trailing whitespaces (over text files only find * -type f -exec sed '...	Santiago Pastorino	2010-08-14	1	-1/+1
*	Eager loading :through associations will join the :source model if there are ...	Grant Ammons	2010-07-08	1	-0/+1
*	Fix for get_ids when including a belongs_to association on a has_many associa...	Diego Algorta	2010-05-15	1	-0/+1
*	Add Relation extensions	Pratik Naik	2010-04-02	1	-0/+6
*	Make default_scope work with Relations	Pratik Naik	2010-01-23	1	-0/+5
*	Simplify calculation scope building. Remove :order from associations as it is...	Pratik Naik	2010-01-18	1	-1/+1
*	Rename named_scope to scope	Pratik Naik	2010-01-18	1	-7/+7
*	Make relations work as scopes	Pratik Naik	2010-01-17	1	-4/+4
*	Make sure named_scope names are not used as method names already	Pratik Naik	2010-01-17	1	-2/+2
*	Ensure hm:t#create respects source associations hash conditions [#2090 state:...	mattbauer	2009-06-21	1	-0/+2
*	Fixed bug that makes named_scopes _forgot_ current scope	Diego Algorta	2009-02-25	1	-0/+6
*	Make sure inner scope conditions get a preference over the outer ones	Pratik Naik	2009-01-24	1	-0/+6
*	explicitly including child associations that are also included in the parent ...	Will Bryant	2008-10-10	1	-0/+1
*	Fix has_many :through when the source is a belongs_to association. [#323 stat...	Zach Dennis	2008-10-04	1	-0/+2
*	Revert "Add :accessible option to Associations for allowing mass assignments ...	Pratik Naik	2008-09-10	1	-6/+0
*	Add :accessible option to Associations for allowing mass assignments using ha...	David Dollar	2008-07-14	1	-0/+6
*	Fix column collision with named_scope and :joins. [#46 state:resolved]	Mark Catley	2008-06-22	1	-1/+6
*	Ensure correct record is returned when preloading has_one where more than one...	Frederick Cheung	2008-05-06	1	-0/+2
*	Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Associ...	Pratik Naik	2008-04-06	1	-0/+14
*	Merge the has_finder gem, renamed as 'named_scope'. Closes #11404 [nkallen]	Rick Olson	2008-03-24	1	-0/+2
*	Make dynamic finders respect the :include on HasManyThrough associations. Cl...	Michael Koziarski	2008-02-18	1	-1/+1
*	Introduce preload query strategy for eager :includes. Closes #9640.	Jeremy Kemper	2008-01-19	1	-0/+3
*	move assets and models	Jeremy Kemper	2008-01-18	1	-0/+59