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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \|	a test case that ensures AR::Relation#merge can merge associations	Akira Matsuda	2012-06-03	1	-0/+8
* \| \| \|	modulize AR::NullRelation	Akira Matsuda	2012-06-01	1	-1/+6
* \| \| \|	Merge branch 'master-sec'	Aaron Patterson	2012-05-31	1	-0/+19
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	predicate builder should not recurse for determining where columns.	Aaron Patterson	2012-05-30	1	-0/+19
* \| \| \|	Fix backward compatibility with stored Hash values. Wrap coders to convert se...	Jeremy Kemper	2012-05-30	1	-13/+16
\| \|/ / \|/\| \|
* \| \|	Merge pull request #5810 from kennyj/fix_5797	Aaron Patterson	2012-05-30	1	-0/+9
\|\ \ \
\| * \| \|	Fix #5797. Error calling dup method on AR model with serialized field	kennyj	2012-05-30	1	-0/+9
* \| \| \|	Merge pull request #6386 from kennyj/fix_logs_name_consistency	Aaron Patterson	2012-05-30	4	-15/+108
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix logs name consistency.	kennyj	2012-05-19	4	-15/+108
* \| \| \|	Add tests to delete by fixnum or string id with has many through associations	Francesco Rodriguez	2012-05-28	1	-0/+20
* \| \| \|	Fix failing build related to change in CollectionAssociation#delete	Carlos Antonio da Silva	2012-05-29	1	-1/+1
* \| \| \|	Allow blocks for count with ActiveRecord::Relation. Document and test that su...	chrisfinne	2012-05-28	1	-0/+16
* \| \| \|	Add support for CollectionAssociation#delete by Fixnum or String	Francesco Rodriguez	2012-05-28	1	-3/+17
\| \|_\|/ \|/\| \|
* \| \|	ConnectionPool wait_timeout no longer used for different types of timeouts. #...	Jonathan Rochkind	2012-05-23	3	-5/+5
* \| \|	changed xml type datetime to dateTime, fixes #6328	Angelo capilleri	2012-05-23	1	-7/+7
* \| \|	Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"	Rafael Mendonça França	2012-05-22	2	-116/+1
\| \|/ \|/\|
* \|	Merge pull request #6368 from Antiarchitect/store-indifferent-access	Jeremy Kemper	2012-05-22	1	-0/+34
\|\ \
\| * \|	Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.	Andrey Voronkov	2012-05-22	1	-0/+34
* \| \|	Restore the frozen state on rollback. Fixes #6417.	Godfrey Chan	2012-05-21	1	-0/+10
* \| \|	Remove not used variables from connection poll test	Carlos Antonio da Silva	2012-05-21	1	-2/+2
* \| \|	Merge pull request #6416 from pmahoney/threadsafe-connection-pool	Aaron Patterson	2012-05-21	2	-1/+116
\|\ \ \
\| * \| \|	Make connection pool fair with respect to waiting threads.	Patrick Mahoney	2012-05-20	2	-1/+116
* \| \| \|	Merge pull request #6143 from senny/composed_of_converter_returns_nil	Aaron Patterson	2012-05-21	1	-0/+18
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	allow the :converter Proc form composed_of to return nil	Yves Senn	2012-05-03	1	-0/+18
* \| \| \|	fixed typo in word finiding	Ivan Kukobko	2012-05-20	1	-1/+1
* \| \| \|	Ensure that CollectionAssociation#replace returns proper target	Piotr Sarnacki	2012-05-19	1	-2/+2
* \| \| \|	Merge pull request #6376 from jgaskins/timestamp-microseconds	Jeremy Kemper	2012-05-18	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Increase `AR#cache_key` precision to nanoseconds	Jamie Gaskins	2012-05-19	1	-1/+1
* \| \| \| \|	fix #delete_all with habtm with :delete_sql	Jon Leighton	2012-05-18	1	-0/+6
* \| \| \| \|	Perf: Don't load the association for #delete_all.	Jon Leighton	2012-05-18	1	-0/+12
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	port some mocha to minitest/mock	Aaron Patterson	2012-05-18	3	-222/+222
\| \|_\|/ \|/\| \|
* \| \|	quarantine more deprecated stuff	Jon Leighton	2012-05-18	4	-36/+36
* \| \|	quarantine deprecated tests	Jon Leighton	2012-05-18	10	-578/+605
\|/ /
* \|	Merge pull request #6250 from iGEL/dont_destroy_readonly_models	Aaron Patterson	2012-05-17	1	-0/+1
\|\ \
\| * \|	Don't destroy readonly models	Johannes Barre	2012-05-17	1	-0/+1
* \| \|	Fix warning: ambiguous first argument.	kennyj	2012-05-18	1	-1/+1
\|/ /
* \|	Merge pull request #6058 from RStankov/relation-from-to-accept-other-relation...	Jon Leighton	2012-05-17	2	-1/+13
\|\ \
\| * \|	Relation#from to accept other Relation objects	Radoslav Stankov	2012-05-17	2	-1/+13
* \| \|	Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when...	Aaron Patterson	2012-05-16	1	-0/+6
\|\ \ \
\| * \| \|	when using a preloaded array and the uniq flag is set then return the size of...	Jon Rowe	2012-03-15	1	-0/+6
* \| \| \|	Merge pull request #6358 from jfirebaugh/schema_define	Aaron Patterson	2012-05-16	1	-0/+7
\|\ \ \ \
\| * \| \| \|	Call methods on the correct instance in AR::Schema.define	John Firebaugh	2012-05-16	1	-0/+7
\| \| \|/ / \| \|/\| \|
* \| \| \|	Fix CollectionAssociation#replace to return new target (closes #6231)	Piotr Sarnacki	2012-05-16	1	-0/+12
* \| \| \|	Merge pull request #6192 from danmcclain/add_inet_and_cidr_types_to_postgresq...	Aaron Patterson	2012-05-16	2	-8/+32
\|\ \ \ \
\| * \| \| \|	Removes NetAddr dependency	Dan McClain	2012-05-08	1	-3/+4
\| * \| \| \|	Converts inet and cidr columns to NetAddr::CIDR	Dan Seaver	2012-05-07	1	-4/+6
\| * \| \| \|	Adds migration and schema dump support for INET, CIDR, and MACADDR	Dan Seaver	2012-05-05	2	-3/+24
* \| \| \| \|	Merge pull request #5535 from markmcspadden/issue_5527_rollbacks	Aaron Patterson	2012-05-16	1	-0/+37
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Allow manual rollbacks in after_save to reset object correctly	Mark McSpadden	2012-03-21	1	-0/+37
* \| \| \| \|	MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless	Aaron Patterson	2012-05-16	1	-1/+5