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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add assert_enqueued_email_with to ActionMailer::TestHelper	Mikkel Malmberg	2017-09-27	3	-0/+92
*	Merge pull request #29716 from mikeycgto/active-support-key-rotator	Kasper Timm Hansen	2017-09-24	20	-253/+975
\|\
\| *	Add key rotation cookies middleware	Michael Coyne	2017-09-24	11	-248/+396
\| *	Add key rotation message Encryptor and Verifier	Michael Coyne	2017-09-23	10	-5/+579
* \|	[ci skip] Fix the with order and explain it.	Kasper Timm Hansen	2017-09-24	1	-3/+8
* \|	Merge pull request #30593 from BigChief45/guides/action-mailer-parameterized	Kasper Timm Hansen	2017-09-24	1	-29/+48
\|\ \
\| * \|	Update Action Mailer Basics [skip ci]	Jaime Alvarez	2017-09-24	1	-29/+48
* \| \|	Merge pull request #30668 from yhirano55/fix_api_guide	Ryuta Kamizono	2017-09-24	1	-1/+0
\|\ \ \
\| * \| \|	Fix rails middleware list in api_app guide [ci skip]	Yoshiyuki Hirano	2017-09-24	1	-1/+0
* \| \| \|	Merge pull request #30689 from yhirano55/fix_email_in_active_support_instrume...	Sean Griffin	2017-09-23	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix email in Active Support Instrumentation [ci skip]	Yoshiyuki Hirano	2017-09-24	1	-2/+2
\|/ / /
* \| \|	Merge pull request #30688 from y-yagi/make_bang_verion_work_with_inheritable_...	Sean Griffin	2017-09-23	2	-1/+14
\|\ \ \
\| * \| \|	Make bang version work with `InheritableOptions`	yuuji.yaginuma	2017-09-23	2	-1/+14
* \| \| \|	Move integer-like primary key normalization to `new_column_definition`	Ryuta Kamizono	2017-09-23	6	-38/+28
* \| \| \|	Adding legacy primary key should be compatible	Ryuta Kamizono	2017-09-23	2	-0/+70
* \| \| \|	Merge pull request #30686 from metaskills/sqlserver-1as1fix	Sean Griffin	2017-09-22	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Ensure `1 AS one` for SQL Server with calculations.	Ken Collins	2017-09-22	1	-1/+1
\|/ / / /
* \| \| \|	Prevent extra `column_for` for `change_column_{default,null,comment}`	Ryuta Kamizono	2017-09-23	1	-7/+4
* \| \| \|	`index_name` should be quoted	Ryuta Kamizono	2017-09-22	1	-1/+1
* \| \| \|	Return nil if table comment is blank	Ryuta Kamizono	2017-09-22	2	-2/+2
* \| \| \|	Merge pull request #30677 from alecspopa/master	Ryuta Kamizono	2017-09-22	2	-0/+32
\|\ \ \ \
\| * \| \| \|	Implement change_table_comment and change_column_comment for MySql Adapter	Alecs Popa	2017-09-22	2	-0/+32
* \| \| \| \|	Merge pull request #30683 from y-yagi/fix_30644	Ryuta Kamizono	2017-09-22	2	-2/+14
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Use `TOPLEVEL_BINDING` in rails runner command	yuuji.yaginuma	2017-09-22	2	-2/+14
\| \|/ / /
* \| \| \|	Merge pull request #24199 from meinac/fix_invert_add_index	Ryuta Kamizono	2017-09-21	3	-2/+13
\|\ \ \ \
\| * \| \| \|	Use algorithm while removing index with db:rollback	Mehmet Emin İNAÇ	2017-09-21	3	-2/+13
\| \|/ / /
* \| \| \|	Merge pull request #30671 from y-yagi/fix_interpreted_as_argument_prefix	Ryuta Kamizono	2017-09-21	1	-5/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix "warning: `*' interpreted as argument prefix"	yuuji.yaginuma	2017-09-21	1	-5/+5
\|/ / /
* \| \|	Merge pull request #30669 from yhirano55/update_link_in_asset_pipeline_guide	Ryuta Kamizono	2017-09-21	1	-1/+1
\|\ \ \
\| * \| \|	Update link in The Asset Pipeline guide [ci skip]	Yoshiyuki Hirano	2017-09-21	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #30619 from jagthedrummer/jeremy/instrumentation-payload-n...	Eileen M. Uchitelle	2017-09-20	3	-4/+83
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update payload names for `sql.active_record` to be more descriptive.	Jeremy Green	2017-09-20	3	-4/+83
* \| \|	Merge pull request #30548 from chumakoff/update_autosave_guides	Eileen M. Uchitelle	2017-09-20	1	-4/+4
\|\ \ \
\| * \| \|	Update Rails Guides about :autosave option	Anton Chumakov	2017-09-20	1	-4/+4
* \| \| \|	Add missing word [ci skip]	George Claghorn	2017-09-20	1	-1/+1
* \| \| \|	Flesh out ActiveStorage::Filename docs	George Claghorn	2017-09-20	1	-6/+14
\|/ / /
* \| \|	Merge pull request #30624 from bogdanvlviv/deprecate_Module_reachable	Sean Griffin	2017-09-20	5	-52/+23
\|\ \ \
\| * \| \|	Remove mentions about `Module#reachable?` in "Active Support Core Extensions"...	bogdanvlviv	2017-09-17	1	-39/+0
\| * \| \|	Remove redundant require_relative "module/anonymous" and "module/reachable"	bogdanvlviv	2017-09-17	1	-3/+0
\| * \| \|	Deprecate `Module#reachable?` method	bogdanvlviv	2017-09-17	3	-10/+23
* \| \| \|	Merge pull request #30629 from yhirano55/add_scope_to_has_one_attached_macro	Eileen M. Uchitelle	2017-09-20	2	-0/+19
\|\ \ \ \
\| * \| \| \|	Add `with_attached_*` scope to `has_one_attached` macro	Yoshiyuki Hirano	2017-09-19	2	-0/+19
* \| \| \| \|	Merge pull request #30616 from yhirano55/update_layouts_and_rendering	Eileen M. Uchitelle	2017-09-20	1	-17/+19
\|\ \ \ \ \
\| * \| \| \| \|	Update Layouts and Rendering in Rails [ci skip]	Yoshiyuki Hirano	2017-09-17	1	-17/+19
* \| \| \| \| \|	Merge pull request #30623 from manojmj92/manojmj92-oo-key-patch	Javan Makhmali	2017-09-20	2	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix error message documentation	Manoj M J	2017-09-20	2	-3/+3
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #30657 from yhirano55/fix_restful_wording	Ryuta Kamizono	2017-09-20	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use RESTful instead of restful	Yoshiyuki Hirano	2017-09-20	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #30655 from kuzukuzu/fix_create_join_table_compatibility	Ryuta Kamizono	2017-09-20	2	-0/+45
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	make create_join_table compatible.	Yuki Masutomi	2017-09-20	2	-0/+45
\|/ / / / / / /