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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #15554 from sgrif/sg-klass	Rafael Mendonça França	2014-06-06	6	-21/+0
\|\ \| \| \| \|	Removed unused `klass` definitions from types
\| *	Removed unused `klass` definitions from types	Sean Griffin	2014-06-06	6	-21/+0
\|/ \| \| \|	Only `Date` and `Time` are handled.
*	eliminate more wasteful allocations	Aaron Patterson	2014-06-06	1	-2/+2
\|
*	Merge pull request #15552 from sgrif/sg-remove-klass-special-case	Rafael Mendonça França	2014-06-06	2	-4/+7
\|\ \| \| \| \|	Remove composed_of special case from multi-parameter attributes
\| *	Remove composed_of special case from multi-parameter attributes	Sean Griffin	2014-06-06	2	-4/+7
\| \| \| \| \| \| \| \| \| \|	As we move towards removing the `klass` method from `column`, the else clause as it stands right now will become the only case.
* \|	Merge pull request #15551 from sgrif/sg-numeric-types	Rafael Mendonça França	2014-06-06	2	-9/+9
\|\ \ \| \| \| \| \| \|	Don't mess with `_before_type_cast` for numeric types
\| * \|	Don't mess with `_before_type_cast` for numeric types	Sean Griffin	2014-06-06	2	-9/+9
\| \|/
* \|	remove another wasteful AS::SafeBuffer allocation	Aaron Patterson	2014-06-06	1	-1/+1
\| \|
* \|	eliminate wasteful AS::SafeBuffer allocation	Aaron Patterson	2014-06-06	1	-1/+1
\| \|
* \|	Revert "Merge pull request #15550 from sgrif/sg-numeric-types"	Rafael Mendonça França	2014-06-06	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit be1db9946616a4005bb7be45656cc0f84d75d915, reversing changes made to 6680ee9427ae2639e404cd3b9538f54e136057c6. Reason: This changed a behavior where numeric attributes when receiving blank values didn't change its value.
* \|	Merge pull request #15550 from sgrif/sg-numeric-types	Rafael Mendonça França	2014-06-06	1	-7/+8
\|\ \ \| \|/ \|/\|	Don't mess with `_before_type_cast` for numeric types
\| *	Don't mess with `_before_type_cast` for numeric types	Sean Griffin	2014-06-06	1	-7/+8
\|/
*	Merge pull request #15548 from ↵	Yves Senn	2014-06-06	1	-0/+4
\|\ \| \| \| \| \| \| \| \|	zuhao/refactor_actionmailer_i18n_with_controller_test Restore I18n.locale to default after test.
\| *	Restore I18n.locale to default after test.	Zuhao Wan	2014-06-07	1	-0/+4
\|/ \| \| \| \| \| \| \| \| \|	If i18n_with_controller_test.rb were to run first, the I18n.locale will be changed to :de, and the following tests in base_test.rb will fail: "subject gets default from I18n" “default subject can have interpolations” "translations are scoped properly" "implicit multipart with default locale"
*	Merge pull request #15544 from zuhao/refactor_actionmailer_test_case	Santiago Pastorino	2014-06-06	1	-0/+8
\|\ \| \| \| \|	Restore test deliveries properly in ActionMailer.
\| *	Restore test deliveries properly in ActionMailer.	Zuhao Wan	2014-06-07	1	-0/+8
\|/ \| \| \| \| \| \| \| \| \| \|	`ActionMailer::Base.delivery_method` and `ActionMailer::Base.perform_deliveries` have leaked states. "delivery method can be customized per instance" and "delivery method can be customized in subclasses not changing the parent" in delivery_methods_test.rb will fail if test_helper_test.rb (in which TestHelperMailerTest is inherited from ActionMailer::TestCase) runs before it.
*	Merge pull request #15533 from sgrif/sg-missing-schema-tests	Yves Senn	2014-06-06	1	-0/+29
\|\ \| \| \| \|	Add missing test cases for schema dumping defaults
\| *	Add missing test cases for schema dumping defaults	Sean Griffin	2014-06-06	1	-0/+29
\| \|
* \|	credit JoseLuis Torres for #15051. [JoseLuis Torres]	Yves Senn	2014-06-06	1	-1/+1
\| \| \| \| \| \| \| \|	[ci skip]
* \|	`ActiveRecord::SchemaMigration` has no primary key.	Yves Senn	2014-06-06	3	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this patch, using `ActiveRecord::Base.primary_key_prefix_type` with `:table_name_with_underscore` would change the `SchemaMigration` model to have a primary key. This resulted in broken queries for PG because it tried to return the inserted PK (which does not exist). Closes #15051. Closes #15419.
* \|	test refactor, don't hardcode default for `table_name_prefix`.	Yves Senn	2014-06-06	1	-1/+2
\| \|
* \|	test refactor, don't hardcode `primary_key_prefix_type` default.	Yves Senn	2014-06-06	1	-0/+3
\| \| \| \| \| \| \| \|	/cc @zuhao
* \|	serialized Type should delegate `type_cast_for_write` to underlying Type	Yves Senn	2014-06-06	2	-1/+36
\|/ \| \| \| \| \| \|	This adds a regression test for #14411, which was fixed by #15503. Closes #14411 Closes #14595
*	Merge pull request #15503 from sgrif/sg-json-hstore-storage	Yves Senn	2014-06-06	9	-20/+29
\|\ \| \| \| \|	Bring type casting behavior of hstore/json in line with serialized
\| *	Bring type casting behavior of hstore/json in line with serialized	Sean Griffin	2014-06-04	9	-20/+29
\| \| \| \| \| \| \| \| \| \|	`@raw_attributes` should not contain the type-cast, mutable version of the value.
* \|	Merge pull request #15540 from nbibler/http-headers-set	Yves Senn	2014-06-06	1	-8/+21
\|\ \ \| \| \| \| \| \|	Use a frozen Set instance for CGI_VARIABLES.
\| * \|	Use a frozen Set instance for CGI_VARIABLES.	Nathaniel Bibler	2014-06-05	1	-8/+21
\| \| \| \| \| \| \| \| \|	Also expand the CGI_VARIABLE name listing to multiple lines for cleaner diffs and legibility.
* \| \|	`bin/rake db:migrate:status` works with legacy migration numbers.	Yves Senn	2014-06-06	5	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The migration numbers were normalized different ways. This left the task output in an inconsistent state. Closes #15538.
* \| \|	docs, update `includes` + `where` example in AR guide. [ci skip]	Yves Senn	2014-06-06	1	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #15541.
* \| \|	Merge pull request #14971 from versioncontrol/#14785	Yves Senn	2014-06-06	3	-1/+26
\|\ \ \ \| \|/ / \|/\| \| \| \| \|	Baseclass becomes! subclass
\| * \|	Fix Baseclass becomes! subclass.	Edo Balvers	2014-05-13	3	-1/+26
\| \| \|
* \| \|	Merge pull request #15536 from sgrif/sg-remove-whiny-nil-thing	Rafael Mendonça França	2014-06-05	1	-8/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Remove optimization that was required with whiny nils
\| * \| \|	Remove optimization that was required with whiny nils	Sean Griffin	2014-06-05	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whiny nils is no longer a thing, so we no longer need this optimization
* \| \| \|	Merge pull request #15535 from coreyward/patch-1	Rafael Mendonça França	2014-06-05	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Avoid misuse of underscore argument
\| * \| \| \|	Avoid misuse of underscore argument	Corey Ward	2014-06-05	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \|	Per convention, underscore-only argument names should be used for unused parameters.
* \| \| \|	Merge pull request #15530 from zuhao/refactor_actionpack_reloader_test	Matthew Draper	2014-06-06	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Reset callbacks after test.
\| * \| \| \|	Reset callbacks after test.	Zuhao Wan	2014-06-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise the state of callback chain is leaked.
* \| \| \| \|	Merge pull request #15513 from zenspider/remove_flush_output_buffer	Aaron Patterson	2014-06-05	3	-91/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removed CaptureHelper#flush_output_buffer as it is only used in tests.
\| * \| \| \| \|	Removed CaptureHelper#flush_output_buffer as it is only used in tests.	Ryan Davis	2014-06-04	3	-91/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reviewed: @tenderlove
* \| \| \| \| \|	Merge pull request #15523 from gregmolnar/doc_fix	Zachary Scott	2014-06-05	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	document include_blank's usage with a string [ci skip]
\| * \| \| \| \| \|	document include_blank's usage with a string [ci skip]	Greg Molnar	2014-06-05	1	-1/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #15532 from zuhao/refactor_actionpack_response_test	Yves Senn	2014-06-05	1	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore Response.default_headers after test.
\| * \| \| \| \| \| \|	Restore Response.default_headers after test.	Zuhao Wan	2014-06-05	1	-2/+4
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #15531 from zuhao/refactor_actionpack_request_test	Yves Senn	2014-06-05	1	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Avoid hard-coded value in test setup/teardown.
\| * \| \| \| \| \|	Avoid hard-coded value in test setup/teardown.	Zuhao Wan	2014-06-05	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_test	Yves Senn	2014-06-05	2	-8/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure Mime::Type is not altered after tests.
\| * \| \| \| \| \|	Mime::PNG is already defined.	Zuhao Wan	2014-06-05	2	-8/+0
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #15521 from edogawaconan/fix_bc_postgres_master	Matthew Draper	2014-06-05	3	-3/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Fix BC year handling in postgres
\| * \| \| \| \|	Fix behavior of handling BC era dates.	edogawaconan	2014-06-05	3	-3/+17
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BC era year is (astronomical year + 1) and starts from 1 BC.
* \| \| \| \|	Merge pull request #15525 from ↵	Yves Senn	2014-06-05	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	zuhao/refactor_actionpack_query_string_parsing_test Avoid hardcoded value in test setup/teardown.