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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \|	Refactor aggregation writer method	Carlos Antonio da Silva	2012-05-21	1	-1/+0
* \|	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	2	-0/+23
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	allow the :converter Proc form composed_of to return nil	Yves Senn	2012-05-03	2	-0/+23
* \| \|	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 #6238 from pwnall/pgsql_bytea_limit	Aaron Patterson	2012-05-17	1	-0/+1
\|\ \
\| * \|	Postgresql doesn't accept limits on binary (bytea) columns.	Victor Costan	2012-05-09	1	-0/+1
* \| \|	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
* \| \| \| \| \|	Merge pull request #6136 from mhfs/sqlbypass_fixes	Aaron Patterson	2012-05-16	1	-0/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Rename test file so that the test suite matches it, implement `persisted?` fo...	Marcelo Silveira	2012-05-16	1	-0/+5
* \| \| \| \| \| \|	Merge pull request #6349 from erichmenge/patch-raise-type-errors	Aaron Patterson	2012-05-16	3	-6/+33
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Integer limit out of range should be allowed to raise. Closes #6272	Erich Menge	2012-05-16	3	-6/+33
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #6336 from erichmenge/patch-pluck-fragment	Carlos Antonio da Silva	2012-05-16	1	-0/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fixes issue where SQL fragments prevented type casting based on column type.	Erich Menge	2012-05-16	1	-0/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Remove unneeded tests	Piotr Sarnacki	2012-05-16	1	-12/+0
* \| \| \| \| \| \|	SQLite3 doesn't actually support the 'time' type.	Erich Menge	2012-05-15	3	-3/+15
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #6325 from kennyj/fix_5832-3	Carlos Antonio da Silva	2012-05-15	1	-5/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unnecessary assertions. We should only test the before_seq isn't same ...	kennyj	2012-05-16	1	-5/+1
* \| \| \| \| \| \|	Restore support for Model.pluck('sql fragment')	Jeremy Kemper	2012-05-15	1	-0/+8
\|/ / / / / /
* \| \| \| \| \|	Set the primary key during #copy_table if necessary. Fixes [#2312]	Sean Scally	2012-05-14	1	-0/+8