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	2010-11-17	1	-2/+0
\|\
\| *	removing many unused variables	Aaron Patterson	2010-11-16	1	-2/+0
* \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-28	1	-0/+46
\|\\|
\| *	default scope merge where clauses [#5488 state:resolved]	Jan	2010-10-20	1	-0/+17
\| *	default scope can accept any object that responds to #call	Aaron Patterson	2010-10-19	1	-0/+18
\| *	Allow default_scope to accept a Proc.	Tim Morgan	2010-10-19	1	-0/+11
\|/
*	reorder removed in favor of except(:order).order	Santiago Pastorino	2010-10-11	1	-8/+2
*	Delegate ActiveRecord::Base.offset to scoped methods (analogous to limit) [#5...	Marcelo Giorgi	2010-09-24	1	-0/+6
*	removing nonsensical tests, limit now actually adds a limit	Aaron Patterson	2010-09-15	1	-1/+1
*	failing test for reorder overriding default_scope	Nick Ragaz	2010-09-05	1	-0/+6
*	order should always be concatenated.	Neeraj Singh	2010-09-05	1	-2/+2
*	Change relation merging to always append select, group and order values	Pratik Naik	2010-08-31	1	-6/+7
*	code gardening: we have assert_(nil\|blank\|present), more concise, with better...	Xavier Noria	2010-08-17	1	-1/+1
*	Deletes trailing whitespaces (over text files only find * -type f -exec sed '...	Santiago Pastorino	2010-08-14	1	-2/+2
*	Ensure default_scope can be overwriten by association conditions.	José Valim	2010-07-21	1	-0/+5
*	eagerly loaded association records should respect default_scope [#2931 state:...	Subba Rao Pasupuleti	2010-07-21	1	-2/+16
*	Added reorder delegation for ActiveRecord::Base(to be able to overwrite the d...	Vitalii Khustochka	2010-07-13	1	-0/+6
*	Add scoping and unscoped as the syntax to replace the old with_scope and with...	José Valim	2010-06-29	1	-0/+396