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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Ensure that CollectionAssociation#replace returns proper target	Piotr Sarnacki	2012-05-19	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* \| \| \| \| \| \| \|	Merge pull request #6376 from jgaskins/timestamp-microseconds	Jeremy Kemper	2012-05-18	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase numeric-timestamp precision to nanoseconds
\| * \| \| \| \| \| \| \|	Increase `AR#cache_key` precision to nanoseconds	Jamie Gaskins	2012-05-19	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix #delete_all with habtm with :delete_sql	Jon Leighton	2012-05-18	2	-0/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	no longer need #delete_all_on_destroy	Jon Leighton	2012-05-18	5	-17/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Perf: Don't load the association for #delete_all.	Jon Leighton	2012-05-18	5	-10/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug #6289
* \| \| \| \| \| \| \| \|	port some mocha to minitest/mock	Aaron Patterson	2012-05-18	3	-222/+222
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6382 from oscardelben/refactor_migration_generator	José Valim	2012-05-18	1	-6/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor migration generator
\| * \| \| \| \| \| \| \|	Refactor migration generator	Oscar Del Ben	2012-05-18	1	-6/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix typo [ci skip]	Jon Leighton	2012-05-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	add changelogs about deprecated stuff [ci skip]	Jon Leighton	2012-05-18	1	-1/+55
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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	2	-8/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgresql doesn't accept limits on binary (bytea) columns.
\| * \| \| \| \| \| \| \|	Postgresql doesn't accept limits on binary (bytea) columns.	Victor Costan	2012-05-09	2	-8/+20
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #6250 from iGEL/dont_destroy_readonly_models	Aaron Patterson	2012-05-17	3	-0/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow to destroy readonly models
\| * \| \| \| \| \| \| \| \|	Don't destroy readonly models	Johannes Barre	2012-05-17	3	-0/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix warning: ambiguous first argument.	kennyj	2012-05-18	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #6058 from ↵	Jon Leighton	2012-05-17	5	-7/+51
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RStankov/relation-from-to-accept-other-relation-objects Relation#from to accept other Relation objects
\| * \| \| \| \| \| \| \|	Relation#from to accept other Relation objects	Radoslav Stankov	2012-05-17	5	-7/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-17	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/core.rb
\| * \| \| \| \| \| \| \| \|	Revert "Update docs in sqlite3 adapter"	Vijay Dev	2012-05-17	1	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 8d7c38b858b0190ac56998f4a4baba250eaf1e4e. Reason: Lot of the additions aren't adding value. [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix typos in docs for ActiveRecord::Core::arel_table [ci skip]	Mark Rushakoff	2012-05-16	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update AR has_one association example	Alexey Vakhov	2012-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update docs in sqlite3 adapter	Oscar Del Ben	2012-05-15	1	-12/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Revert "corrected some misspelling"	Vijay Dev	2012-05-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3b6c0e35d0c6e2671c423fd8524e88b3bf25503b. Reason: changelogs aren't meant to be edited in docrails.
\| * \| \| \| \| \| \| \| \|	Merge pull request #99 from GRoguelon/master	Vijay Dev	2012-05-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an error in methods example of instanciated fixtures.
\| \| * \| \| \| \| \| \| \| \|	Fix an error in example in methods of instanciated fixtures.	Geoffrey Roguelon	2012-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	corrected some misspelling	Angelo capilleri	2012-05-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix typo [ci skip]	Peter Suschlik	2012-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #5453 from ↵	Aaron Patterson	2012-05-16	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JonRowe/patch_uniq_has_and_belongs_to_many_when_already_loaded When Active Record has already loaded a unique association `.size` returns the wrong number.
\| * \| \| \| \| \| \| \| \| \| \|	when using a preloaded array and the uniq flag is set then return the size ↵	Jon Rowe	2012-03-15	2	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of the uniq array
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6358 from jfirebaugh/schema_define	Aaron Patterson	2012-05-16	2	-7/+17
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call methods on the correct instance in AR::Schema.define
\| * \| \| \| \| \| \| \| \| \| \| \|	Call methods on the correct instance in AR::Schema.define	John Firebaugh	2012-05-16	2	-7/+17
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that migrations support instance methods, we should use the same instance rather than relying on delegation to a global instance. This allows subclassing AR::Schema.
* \| \| \| \| \| \| \| \| \| \| \|	Fix CollectionAssociation#replace to return new target (closes #6231)	Piotr Sarnacki	2012-05-16	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6192 from ↵	Aaron Patterson	2012-05-16	5	-15/+97
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	danmcclain/add_inet_and_cidr_types_to_postgresql_adapter Add support for macaddr, inet, and cidr types to PostgreSQL adapter
\| * \| \| \| \| \| \| \| \| \| \| \|	Removes NetAddr dependency	Dan McClain	2012-05-08	3	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Converts inet and cidr columns to NetAddr::CIDR	Dan Seaver	2012-05-07	5	-7/+48
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Adds migration and schema dump support for INET, CIDR, and MACADDR	Dan Seaver	2012-05-05	3	-7/+47
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #5535 from markmcspadden/issue_5527_rollbacks	Aaron Patterson	2012-05-16	2	-1/+46
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Allow manual rollbacks in after_save to reset object correctly
\| * \| \| \| \| \| \| \| \| \| \| \|	Allow manual rollbacks in after_save to reset object correctly	Mark McSpadden	2012-03-21	2	-1/+46
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	assuming there is only one column, we can simplify the type cast loop	Aaron Patterson	2012-05-16	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	MySQL returns "SUM(DISTINCT(credit_limit))" as the column name unless	Aaron Patterson	2012-05-16	2	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an alias is provided. Without the alias, the column cannot be found and properly typecast.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6136 from mhfs/sqlbypass_fixes	Aaron Patterson	2012-05-16	2	-5/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring SqlByPassTest to light and fix broken tests
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Rename test file so that the test suite matches it, implement `persisted?` ↵	Marcelo Silveira	2012-05-16	2	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for SqlBypass as expected by tests and convert session_id to string before using on queries to get correct quotes on postgresql (avoid casting error).
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6349 from erichmenge/patch-raise-type-errors	Aaron Patterson	2012-05-16	4	-7/+34
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integer limit out of range should be allowed to raise. Closes #6272
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Integer limit out of range should be allowed to raise. Closes #6272	Erich Menge	2012-05-16	4	-7/+34
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #6336 from erichmenge/patch-pluck-fragment	Carlos Antonio da Silva	2012-05-16	2	-8/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue where SQL fragments prevented type casting based on column
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue where SQL fragments prevented type casting based on column type.	Erich Menge	2012-05-16	2	-8/+6
\| \|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneeded tests	Piotr Sarnacki	2012-05-16	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|