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

	Commit message (Expand)	Author	Age	Files	Lines
*	test refactor, don't hardcode `primary_key_prefix_type` default.	Yves Senn	2014-06-06	1	-0/+3
*	serialized Type should delegate `type_cast_for_write` to underlying Type	Yves Senn	2014-06-06	2	-1/+36
*	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	Sean Griffin	2014-06-04	9	-20/+29
* \|	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.	Nathaniel Bibler	2014-06-05	1	-8/+21
* \| \|	`bin/rake db:migrate:status` works with legacy migration numbers.	Yves Senn	2014-06-06	5	-4/+22
* \| \|	docs, update `includes` + `where` example in AR guide. [ci skip]	Yves Senn	2014-06-06	1	-3/+16
* \| \|	Merge pull request #14971 from versioncontrol/#14785	Yves Senn	2014-06-06	3	-1/+26
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	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	Sean Griffin	2014-06-05	1	-8/+0
* \| \| \|	Merge pull request #15535 from coreyward/patch-1	Rafael Mendonça França	2014-06-05	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Avoid misuse of underscore argument	Corey Ward	2014-06-05	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #15530 from zuhao/refactor_actionpack_reloader_test	Matthew Draper	2014-06-06	1	-0/+5
\|\ \ \ \
\| * \| \| \|	Reset callbacks after test.	Zuhao Wan	2014-06-05	1	-0/+5
* \| \| \| \|	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.	Ryan Davis	2014-06-04	3	-91/+0
* \| \| \| \| \|	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]	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.	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.	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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 behavior of handling BC era dates.	edogawaconan	2014-06-05	3	-3/+17
\| \|/ / / /
* \| \| \| \|	Merge pull request #15525 from zuhao/refactor_actionpack_query_string_parsing...	Yves Senn	2014-06-05	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Avoid hardcoded value in test setup/teardown.	Zuhao Wan	2014-06-05	1	-1/+2
\|/ / / /
* \| \| \|	Merge pull request #15512 from akshay-vishnoi/delete-deprecated-method	Yves Senn	2014-06-05	3	-54/+5
\|\ \ \ \
\| * \| \| \|	Remove deprecated method ActiveRecord::Migrator.proper_table_name	Akshay Vishnoi	2014-06-05	3	-54/+4
* \| \| \| \|	Merge pull request #15421 from gchan/time_with_zone_precision	Matthew Draper	2014-06-05	3	-1/+36
\|\ \ \ \ \
\| * \| \| \| \|	Fixed `ActiveSupport::TimeWithZone#-` so precision is not unnecessarily lost	Gordon Chan	2014-05-30	3	-1/+36
* \| \| \| \| \|	Merge pull request #15518 from jonathancadepowers/master	Guillermo Iguaran	2014-06-05	1	-0/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update getting_started.md	Jonathan Powers	2014-06-05	1	-0/+2
\| * \| \| \| \| \|	Update getting_started.md	Jonathan Powers	2014-06-05	1	-0/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15515 from leafac/fix-inverse-associations-block-test	Matthew Draper	2014-06-05	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix inverse associations test	Leandro Facchinetti	2014-06-04	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #15497 from schneems/schneems/levenshtein-generator-failur...	Rafael Mendonça França	2014-06-04	3	-9/+63
\|\ \ \ \ \
\| * \| \| \| \|	Emit suggested generator names when not found	schneems	2014-06-04	3	-9/+63
\|/ / / / /
* \| \| \| \|	have an actual `NullColumn` object and update docs accordingly.	Yves Senn	2014-06-04	4	-5/+16
* \| \| \| \|	Revert "Correct Documentation for asset_tag_helpers"	Rafael Mendonça França	2014-06-04	1	-17/+16
* \| \| \| \|	Merge pull request #15502 from sgrif/sg-use-null-column	Yves Senn	2014-06-04	2	-23/+23
\|\ \ \ \ \
\| * \| \| \| \|	Use null column for association key types	Sean Griffin	2014-06-04	2	-23/+23
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Aaron Patterson	2014-06-04	34	-134/+268
\|\ \ \ \ \
\| * \| \| \| \|	For our build, stick with mail 2.5.x for now	Matthew Draper	2014-06-05	1	-0/+1
\| * \| \| \| \|	Merge pull request #15504 from sgrif/sg-postgres-defaults	Rafael Mendonça França	2014-06-04	2	-48/+11
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Collapse PG default extractoin of most types to single regex	Sean Griffin	2014-06-04	2	-48/+11
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #15495 from maurogeorge/action-mailer-subject-guides	Rafael Mendonça França	2014-06-04	1	-0/+18
\| \|\ \ \ \ \