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

	Commit message (Collapse)	Author	Age	Files	Lines
*	allow AssociationProxy#scoped to take options so that API is the same as ↵	Jon Leighton	2012-04-27	1	-0/+4
\| \| \| \|	Base#scoped
*	%s/find(:\(first\\|last\\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵	Jon Leighton	2012-04-27	26	-406/+324
\| \| \| \|	things
*	remove unnecessary test code	Jon Leighton	2012-04-27	1	-4/+0
\|
*	Merge branch 'master' of github.com:rails/rails	Jon Leighton	2012-04-27	4	-4/+4
\|\
\| *	fix tests for SQLite3Adapter	Andrey Deryabin	2012-04-27	3	-3/+3
\| \|
\| *	fix tests for sqlite3	Andrey Deryabin	2012-04-27	1	-1/+1
\| \|
* \|	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
\|
*	remove deprecate #update_all usage	Jon Leighton	2012-04-26	2	-9/+3
\|
*	fix #scoped deprecations	Jon Leighton	2012-04-26	4	-15/+16
\|
*	remove deprecated scope stuff	Jon Leighton	2012-04-26	2	-32/+0
\|
*	default_scope with a hash is deprecated	Jon Leighton	2012-04-26	1	-10/+0
\|
*	remove tests for #with_scope (it's now deprecated)	Jon Leighton	2012-04-25	12	-761/+6
\|
*	Merge pull request #5973 from academia-edu/master	Aaron Patterson	2012-04-25	1	-1/+9
\|\ \| \| \| \|	Always quote hstore keys and values
\| *	Always quote hstore keys and values	Ryan Fitzgerald	2012-04-24	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	escape_hstore uses quotation marks around keys and values only if it seems necessary. However, it currently breaks in the presence of some non-ASCII characters. Instead of trying to guess exactly which characters are safe, it seems better to always use quotes.
* \|	Merge remote-tracking branch 'kennyj/fix_5563'	Jon Leighton	2012-04-25	1	-0/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/test/cases/associations/belongs_to_associations_test.rb
\| * \|	Fix #5563. Should reflect the most recent change to either of association / id.	kennyj	2012-04-13	1	-0/+11
\| \| \|
* \| \|	add missing test	Jon Leighton	2012-04-25	1	-0/+12
\| \| \|
* \| \|	extract deprecated code	Jon Leighton	2012-04-25	1	-5/+0
\| \| \|
* \| \|	Extract deprecated code	Jon Leighton	2012-04-25	1	-0/+5
\| \| \|
* \| \|	fix interpolation for hash merging	Jon Leighton	2012-04-25	1	-4/+13
\| \| \|
* \| \|	allow merging a single where value	Jon Leighton	2012-04-25	1	-0/+6
\| \| \|
* \| \|	giving a hash to default scope should not be deprecated (well, not for this ↵	Jon Leighton	2012-04-25	1	-2/+2
\| \|/ \|/\| \| \| \| \|	reason)
* \|	Fix build. It seems that the Mocha's behavior were changed.	kennyj	2012-04-25	2	-3/+9
\| \|
* \|	be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵	Akira Matsuda	2012-04-19	1	-0/+30
\| \| \| \| \| \| \| \|	option
* \|	opening a connection will block if the pool is full	Aaron Patterson	2012-04-15	1	-0/+24
\| \|
* \|	Automatically create indexes for references/belongs_to statements in migrations.	Joshua Wood	2012-04-14	2	-0/+100
\| \|
* \|	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
\| * \|	Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix	Yasuo Honda	2012-04-13	1	-4/+4
\| \| \|
* \| \|	fix tests	Jon Leighton	2012-04-13	7	-81/+74
\| \| \|
* \| \|	Merge pull request #5832 from kennyj/fix_5267	Jon Leighton	2012-04-13	1	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Fix a wrong return value from reset_sequence_name method.
\| * \| \|	Fix wrong return value from reset_sequence_name method.	kennyj	2012-04-14	1	-2/+6
\| \| \| \|
* \| \| \|	now we can just manipulate the values hash in #only and #except	Jon Leighton	2012-04-13	1	-0/+13
\| \| \| \|
* \| \| \|	use a hash to store relation values	Jon Leighton	2012-04-13	1	-7/+7
\|/ / /
* \| \|	remove apply_finder_options call from AssociationScope	Jon Leighton	2012-04-13	1	-0/+5
\| \| \|
* \| \|	Make Relation#extending work like other value methods	Jon Leighton	2012-04-13	1	-8/+9
\| \| \|
* \| \|	Add Relation#merge!	Jon Leighton	2012-04-13	1	-0/+5
\| \| \|
* \| \|	assert valid keys	Jon Leighton	2012-04-13	1	-0/+4
\| \| \|
* \| \|	Allow Relation#merge to take a hash	Jon Leighton	2012-04-13	1	-2/+20
\| \| \|
* \| \|	we have no need for the ASSOCIATION_METHODS constant	Jon Leighton	2012-04-13	1	-8/+1
\| \| \|
* \| \|	we don't need to test that constant assignment works	Jon Leighton	2012-04-13	1	-15/+0
\|/ /
* /	Add bang versions of relation query methods.	Jon Leighton	2012-04-12	1	-0/+52
\|/ \| \| \| \|	The main reason for this is that I want to separate the code that does the mutating from the code that does the cloning.
*	Merge pull request #5720 from kennyj/should_use_klass_method	Jon Leighton	2012-04-11	1	-0/+1
\|\ \| \| \| \|	Get a properly aliased_table_name, when we use a polymorphic association.
\| *	Get a properly aliased_table_name, when we use a polymorphic association.	kennyj	2012-04-04	1	-0/+1
\| \|
* \|	Override AR::Relation methods in NullRelation.	Juanjo Bazán	2012-04-11	1	-0/+33
\| \| \| \| \| \|	So a NullRelation (Relation#none) is chainable with database methods.
* \|	Fix delete_all when chained with joins.	Rafael Mendonça França	2012-04-10	1	-1/+19
\| \| \| \| \| \| \| \|	Closes #5202 and #919