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	1	-1/+1
*	fix tests for SQLite3Adapter	Andrey Deryabin	2012-04-27	1	-1/+0
*	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
*	merged sqlite and sqlite3 adapters	Andrey Deryabin	2012-04-27	2	-546/+538
*	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	2	-3/+3
\|/
*	Merge pull request #5973 from academia-edu/master	Aaron Patterson	2012-04-25	1	-2/+1
\|\
\| *	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	1	-2/+1
* \|	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	4	-4/+6
\|\ \ \
\| * \| \|	Fix #5563. Should reflect the most recent change to either of association / id.	kennyj	2012-04-13	1	-1/+2
\| * \| \|	@stale_state should be nil when a model isn't saved.	kennyj	2012-04-13	3	-3/+4
* \| \| \|	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	1	-4/+2
* \| \| \|	Extract deprecated code	Jon Leighton	2012-04-25	1	-9/+8
* \| \| \|	fix interpolation for hash merging	Jon Leighton	2012-04-25	2	-20/+26
* \| \| \|	allow merging a single where value	Jon Leighton	2012-04-25	1	-1/+1
* \| \| \|	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	1	-1/+1
* \| \| \|	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
\|/ / /
* \| \|	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	1	-1/+1
\|/ / /
* \| \|	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
\| * \| \|	Added documentation to explain what happens if you don't set any values for t...	Rodrigo Flores	2012-04-12	1	-2/+5
\| * \| \|	Fix typo on the add_index.	kennyj	2012-04-13	1	-1/+1
\| \|/ /
* \| \|	opening a connection will block if the pool is full	Aaron Patterson	2012-04-15	1	-20/+39
* \| \|	Automatically create indexes for references/belongs_to statements in migrations.	Joshua Wood	2012-04-14	3	-5/+23
* \| \|	extract deprecated code for #find, #first, #last, #all	Jon Leighton	2012-04-13	1	-105/+36
* \| \|	extract deprecated #calculate code	Jon Leighton	2012-04-13	1	-83/+25
* \| \|	move code out to active_record_deprecated_finders	Jon Leighton	2012-04-13	1	-7/+2
* \| \|	Merge pull request #5832 from kennyj/fix_5267	Jon Leighton	2012-04-13	1	-1/+1
\|\ \ \
\| * \| \|	Fix wrong return value from reset_sequence_name method.	kennyj	2012-04-14	1	-1/+1
* \| \| \|	move some of the update_all implementation to active_record_deprecated_finders	Jon Leighton	2012-04-13	1	-27/+14
* \| \| \|	now we can just manipulate the values hash in #only and #except	Jon Leighton	2012-04-13	3	-36/+13
* \| \| \|	use a hash to store relation values	Jon Leighton	2012-04-13	4	-45/+67
\|/ / /
* \| \|	doesn't make sense for select! to take a block	Jon Leighton	2012-04-13	1	-8/+3
* \| \|	remove apply_finder_options call from AssociationScope	Jon Leighton	2012-04-13	3	-9/+10
* \| \|	Make Relation#extending work like other value methods	Jon Leighton	2012-04-13	4	-19/+13
* \| \|	Add Relation#merge!	Jon Leighton	2012-04-13	1	-9/+12