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

	Commit message (Expand)	Author	Age	Files	Lines
*	%s/find(:\(first\\|last\\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other th...	Jon Leighton	2012-04-27	30	-415/+333
*	remove unnecessary test code	Jon Leighton	2012-04-27	2	-9/+1
*	Merge branch 'master' of github.com:rails/rails	Jon Leighton	2012-04-27	7	-552/+543
\|\
\| *	fix tests for SQLite3Adapter	Andrey Deryabin	2012-04-27	4	-4/+3
\| *	renamed class SQLiteColumn to SQLite3Column	Andrey Deryabin	2012-04-27	1	-3/+3
\| *	removed tail of old sqlite versions	Andrey Deryabin	2012-04-27	1	-9/+9
\| *	fix SQLite3Adapter doc	Andrey Deryabin	2012-04-27	1	-2/+2
\| *	Upgrade sqlite3 version to 1.3.6	Andrey Deryabin	2012-04-27	1	-1/+1
\| *	fix tests for sqlite3	Andrey Deryabin	2012-04-27	1	-1/+1
\| *	merged sqlite and sqlite3 adapters	Andrey Deryabin	2012-04-27	2	-546/+538
* \|	don't need this test	Jon Leighton	2012-04-26	1	-5/+0
\|/
*	remove calls to find(:first), find(:last) and find(:all)	Jon Leighton	2012-04-26	27	-119/+114
*	remove deprecate #all usage	Jon Leighton	2012-04-26	4	-7/+3
*	remove deprecated #first calls	Jon Leighton	2012-04-26	3	-28/+3
*	remove deprecate #calculate calls	Jon Leighton	2012-04-26	11	-146/+72
*	remove deprecated #find_in_batches calls	Jon Leighton	2012-04-26	2	-15/+3
*	EXPLAIN only for sqlite3	Andrey Deryabin	2012-04-26	2	-24/+25
*	Merge pull request #5995 from kennyj/fix_5847-3	Jon Leighton	2012-04-26	1	-0/+5
\|\
\| *	Fix #5847 and #4045. Load AR::Base before loading an application model.	kennyj	2012-04-26	1	-0/+5
* \|	remove deprecate #update_all usage	Jon Leighton	2012-04-26	4	-12/+6
* \|	fix #scoped deprecations	Jon Leighton	2012-04-26	4	-15/+16
* \|	remove deprecated scope stuff	Jon Leighton	2012-04-26	5	-54/+2
* \|	default_scope with a hash is deprecated	Jon Leighton	2012-04-26	1	-10/+0
\|/
*	remove unused method	Jon Leighton	2012-04-25	1	-6/+0
*	remove tests for #with_scope (it's now deprecated)	Jon Leighton	2012-04-25	13	-767/+6
*	Merge pull request #5973 from academia-edu/master	Aaron Patterson	2012-04-25	2	-3/+10
\|\
\| *	Restore .to_s to escape_hstore	Ryan Fitzgerald	2012-04-24	1	-1/+1
\| *	Always quote hstore keys and values	Ryan Fitzgerald	2012-04-24	2	-3/+10
* \|	Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'	Jon Leighton	2012-04-25	1	-0/+13
\|\ \
\| * \|	Define array methods in ActiveRecord::Associations::CollectionProxy	Jorge Bejar	2012-04-18	1	-0/+13
* \| \|	Merge remote-tracking branch 'kennyj/fix_5563'	Jon Leighton	2012-04-25	5	-4/+17
\|\ \ \
\| * \| \|	Fix #5563. Should reflect the most recent change to either of association / id.	kennyj	2012-04-13	2	-1/+13
\| * \| \|	@stale_state should be nil when a model isn't saved.	kennyj	2012-04-13	3	-3/+4
* \| \| \|	add missing test	Jon Leighton	2012-04-25	1	-0/+12
* \| \| \|	extract #with_scope and #with_exclusive_scope to active_record_deprecated_fin...	Jon Leighton	2012-04-25	2	-122/+4
* \| \| \|	extract deprecated code	Jon Leighton	2012-04-25	3	-11/+4
* \| \| \|	Extract deprecated code	Jon Leighton	2012-04-25	2	-9/+13
* \| \| \|	fix interpolation for hash merging	Jon Leighton	2012-04-25	3	-24/+39
* \| \| \|	allow merging a single where value	Jon Leighton	2012-04-25	2	-1/+7
* \| \| \|	extract to active_record_deprecated_finders	Jon Leighton	2012-04-25	1	-6/+5
* \| \| \|	giving a hash to default scope should not be deprecated (well, not for this r...	Jon Leighton	2012-04-25	2	-3/+3
* \| \| \|	Merge pull request #5976 from aderyabin/fix1	Jeremy Kemper	2012-04-25	1	-5/+0
\|\ \ \ \
\| * \| \| \|	already defined in quoting	Andrey Deryabin	2012-04-25	1	-5/+0
\| \| \|_\|/ \| \|/\| \|
* / \| \|	cleanliness in method parameters	Andrey Deryabin	2012-04-25	1	-1/+1
\|/ / /
* \| \|	Fix build. It seems that the Mocha's behavior were changed.	kennyj	2012-04-25	2	-3/+9
* \| \|	Merge pull request #5887 from mcrowe/document-relation-merge	Vijay Dev	2012-04-23	1	-0/+14
\|\ \ \
\| * \| \|	Add documentation to the SpawnMethods#merge method.	Mitch Crowe	2012-04-17	1	-0/+14
* \| \| \|	be sure to currectly fetch PK name from MySQL even if the PK has some custom ...	Akira Matsuda	2012-04-19	2	-1/+31
\|/ / /
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-18	1	-1/+1
\|\ \ \
\| * \| \|	Revert "Added documentation to explain what happens if you don't set any valu...	Rodrigo Flores	2012-04-12	1	-5/+2