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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26232 from kamipo/fix_oid_bit_cast_value	Sean Griffin	2016-08-20	2	-4/+5
\|\
\| *	Fix `OID::Bit#cast_value`	Ryuta Kamizono	2016-08-20	2	-4/+5
* \|	Merge pull request #26233 from y-yagi/update_retry_on_example	प्रथमेश Sonpatki	2016-08-20	1	-2/+2
\|\ \
\| * \|	correct exception class in `retry_on` example [ci skip]	yuuji.yaginuma	2016-08-20	1	-2/+2
\|/ /
* \|	Merge pull request #26224 from jonatack/consistent-asset-precompile-examples	Eileen M. Uchitelle	2016-08-19	5	-10/+11
\|\ \ \| \|/ \|/\|
\| *	Consistent examples and template for assets#precompile	Jon Atack	2016-08-19	5	-10/+11
* \|	Merge pull request #26219 from kamipo/remove_unused_blob_or_text_column	Rafael França	2016-08-19	2	-9/+0
\|\ \
\| * \|	Remove unused `blob_or_text_column?` method	Ryuta Kamizono	2016-08-19	2	-9/+0
* \| \|	Merge pull request #26218 from kamipo/remove_unnecessary_length	Rafael França	2016-08-19	2	-12/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove unnecessary `length` method for collection proxy	Ryuta Kamizono	2016-08-19	2	-12/+6
* \| \|	Copy edits in the documentation [ci skip]	Rafael Mendonça França	2016-08-19	2	-4/+6
* \| \|	Merge pull request #26212 from evmunro/as-json-sets-request-to-json-for-contr...	Rafael França	2016-08-19	3	-1/+22
\|\ \ \
\| * \| \|	Set the request type if as: is specified	Everest Munro-Zeisberger	2016-08-18	3	-1/+22
* \| \| \|	Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widths	Rafael Mendonça França	2016-08-19	4	-11/+125
\|\ \ \ \
\| * \| \| \|	Merge branch 'master' into schema-no-standardized-column-widths	Tim Petricola	2016-08-18	4	-117/+137
\| \|\\| \| \|
\| * \| \| \|	Option not to line up column types and attributes in schema.rb	Tim Petricola	2016-08-17	4	-14/+128
* \| \| \| \|	Add chengelog entry to #25976	Rafael Mendonça França	2016-08-19	1	-0/+7
* \| \| \| \|	Merge pull request #26154 from kamipo/remove_text_default_treated_as_empty_st...	Rafael Mendonça França	2016-08-19	6	-84/+70
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Remove text default treated as an empty string in non-strict mode	Ryuta Kamizono	2016-08-19	6	-84/+70
* \| \| \| \|	Merge pull request #26217 from kamipo/revert_23067	Rafael França	2016-08-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Revert "`sql_for_insert` returns values for passing to `exec_insert`"	Ryuta Kamizono	2016-08-19	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #25989 from kamipo/remove_unnecessary_select_for_collectio...	Rafael França	2016-08-19	2	-11/+6
\|\ \ \ \ \
\| * \| \| \| \|	Remove unnecessary `select` method for `CollectionProxy`	Ryuta Kamizono	2016-08-18	2	-11/+6
* \| \| \| \| \|	Merge pull request #26216 from y-yagi/fixes_19880	Rafael França	2016-08-19	3	-2/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	run `before_configuration` callbacks as soon as application constant inherits...	yuuji.yaginuma	2016-08-19	3	-2/+16
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #26089 from travisoneill/sqlite_rollback_fix	Rafael Mendonça França	2016-08-19	4	-5/+31
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Added nil case handling to allow rollback migration in case of	travis.h.oneill@gmail.com	2016-08-17	4	-5/+31
\| \|/ / / /
* \| \| \| \|	Merge pull request #24099 from k0kubun/preserve-readonly	Rafael Mendonça França	2016-08-18	5	-4/+31
\|\ \ \ \ \
\| * \| \| \| \|	Preserve readonly flag only for readonly association	Takashi Kokubun	2016-07-30	5	-4/+29
* \| \| \| \| \|	Merge pull request #26200 from kamipo/remove_unnecessary_ordinal_methods	Rafael França	2016-08-18	3	-93/+84
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unnecessary ordinal methods for collection association	Ryuta Kamizono	2016-08-18	3	-93/+84
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #25999 from kamipo/remove_sanitize_conditions	Rafael França	2016-08-18	3	-4/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Deprecate `sanitize_conditions`. Use `sanitize_sql` instead	Ryuta Kamizono	2016-08-18	3	-4/+8
* \| \| \| \| \| \|	Merge pull request #26197 from kamipo/remove_unnecessary_test_sql_for_insert_...	Rafael França	2016-08-18	2	-9/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove unnecessary `test_sql_for_insert_with_returning_disabled`	Ryuta Kamizono	2016-08-18	2	-9/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #26214 from philnash/active-job-default-queue	Claudio B	2016-08-18	1	-3/+4
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	[ci skip] Updates ActiveJob guide on default runner.	Phil Nash	2016-08-18	1	-3/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #26193 from iancanderson/ia-document-i18n-required-message	Jon Moss	2016-08-17	1	-0/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	i18n documentation for required belongs_to message	Ian C. Anderson	2016-08-17	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Change method visibility to be private	Rafael Mendonça França	2016-08-17	1	-57/+57
* \| \| \| \|	Push :defaults extraction down one level	Rafael Mendonça França	2016-08-17	2	-60/+78
\|/ / / /
* \| \| \|	Merge pull request #26192 from greenbigfrog/patch-2	Jon Moss	2016-08-17	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Fix #26187	Jonathan	2016-08-17	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #26188 from greenbigfrog/patch-2	प्रथमेश Sonpatki	2016-08-17	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Fix diffrent naming in getting_started.md	Jonathan	2016-08-17	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25396 from kamipo/fix_error_message_for_out_of_range_inte...	Rafael França	2016-08-17	1	-1/+1
\|\ \ \
\| * \| \|	Fix error message for out of range byte size integer value for consistency	Ryuta Kamizono	2016-08-07	1	-1/+1
* \| \| \|	Merge pull request #25628 from ysksn/options	Rafael Mendonça França	2016-08-17	4	-5/+11
\|\ \ \ \
\| * \| \| \|	Update CHANGELOG.md for #25628 [ci skip]	Yosuke Kabuto	2016-07-02	4	-5/+11
* \| \| \| \|	Merge pull request #26186 from yasulab/fix-link-in-rails5-release-note	Guillermo Iguaran	2016-08-16	1	-1/+1
\|\ \ \ \ \