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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| *	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
* \|	Update Rails 3.2.3 release date in changelogs as March 30, 2012	Michael de Silva	2012-04-16	1	-1/+1
* \|	opening a connection will block if the pool is full	Aaron Patterson	2012-04-15	2	-20/+63
* \|	Automatically create indexes for references/belongs_to statements in migrations.	Joshua Wood	2012-04-14	6	-5/+145
* \|	Merge pull request #5837 from yahonda/new_sequence_name_is_too_long	Jon Leighton	2012-04-14	1	-4/+4
\|\ \
\| * \|	Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix	Yasuo Honda	2012-04-13	1	-4/+4
* \| \|	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
* \| \|	fix tests	Jon Leighton	2012-04-13	7	-81/+74
* \| \|	Merge pull request #5832 from kennyj/fix_5267	Jon Leighton	2012-04-13	2	-3/+7
\|\ \ \
\| * \| \|	Fix wrong return value from reset_sequence_name method.	kennyj	2012-04-14	2	-3/+7
* \| \| \|	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	4	-36/+26
* \| \| \|	use a hash to store relation values	Jon Leighton	2012-04-13	5	-52/+74
\|/ / /
* \| \|	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	4	-9/+15
* \| \|	Make Relation#extending work like other value methods	Jon Leighton	2012-04-13	5	-27/+22
* \| \|	Add Relation#merge!	Jon Leighton	2012-04-13	2	-9/+17
* \| \|	assert valid keys	Jon Leighton	2012-04-13	3	-0/+11
* \| \|	Allow Relation#merge to take a hash	Jon Leighton	2012-04-13	4	-49/+95
* \| \|	we have no need for the ASSOCIATION_METHODS constant	Jon Leighton	2012-04-13	4	-15/+11
* \| \|	we don't need to test that constant assignment works	Jon Leighton	2012-04-13	1	-15/+0
* \| \|	refactoring	Jon Leighton	2012-04-13	1	-36/+45
* \| \|	Extract clusterfuck method for surgery	Jon Leighton	2012-04-13	2	-71/+92
\|/ /
* \|	mention that coercion only happens when the primary key is an integer and use...	Reg Braithwaite	2012-04-12	1	-2/+2
* \|	Documents that ActiveRecord's find by id uses to_i to coerce its arguments to...	Reg Braithwaite	2012-04-12	1	-1/+3
* \|	Add bang versions of relation query methods.	Jon Leighton	2012-04-12	3	-84/+194
\|/
*	Some refactor for association.	kennyj	2012-04-12	3	-8/+7
*	move apply_finder_options to active_record_deprecated_finders	Jon Leighton	2012-04-12	1	-22/+0
*	add active_record_deprecated_finders as a dep	Jon Leighton	2012-04-12	2	-0/+3
*	Merge pull request #5720 from kennyj/should_use_klass_method	Jon Leighton	2012-04-11	2	-1/+2
\|\
\| *	Get a properly aliased_table_name, when we use a polymorphic association.	kennyj	2012-04-04	2	-1/+2
* \|	Override AR::Relation methods in NullRelation.	Juanjo Bazán	2012-04-11	2	-0/+86
* \|	Corrected grammatical errors in schema_dumper and scoping/default	dcurtis	2012-04-10	2	-2/+2
* \|	Fix delete_all when chained with joins.	Rafael Mendonça França	2012-04-10	4	-17/+59
* \|	Merge pull request #5718 from benedikt/master	Jeremy Kemper	2012-04-08	4	-6/+13
\|\ \
\| * \|	Adds test to check that circular preloading does not modify Model.unscoped (a...	Benedikt Deicke	2012-04-03	3	-4/+8
\| * \|	Removes caching from ActiveRecord::Core::ClassMethods#relation	Benedikt Deicke	2012-04-03	3	-6/+9
\| \|/
* \|	fix markup error [ci skip]	Vijay Dev	2012-04-08	1	-1/+1