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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #30715 from y-yagi/remove_unused_fixtures	Ryuta Kamizono	2017-09-26	3	-7/+0
\|\
\| *	Remove unused fixtures	yuuji.yaginuma	2017-09-26	3	-7/+0
\|/
*	[ci skip] Don't mention unrotatable secret_key_base.	Kasper Timm Hansen	2017-09-25	1	-18/+20
*	Merge pull request #30705 from frodsan/use-digest-thread-safe	Matthew Draper	2017-09-26	2	-2/+2
\|\
\| *	Preload digest/sha2 to avoid thread safe error.	Francesco Rodriguez	2017-09-25	2	-2/+2
* \|	Merge pull request #30700 from y-yagi/respect_quiet_option	Kasper Timm Hansen	2017-09-25	3	-17/+22
\|\ \
\| * \|	Respect quiet option in all process of `rails new` command	yuuji.yaginuma	2017-09-25	3	-17/+22
\| \|/
* \|	Merge pull request #30703 from dixpac/fix_minor_code_climate_issue	Kasper Timm Hansen	2017-09-25	1	-1/+1
\|\ \
\| * \|	Fix minor CodeClimate issue	dixpac	2017-09-25	1	-1/+1
\| \|/
* \|	Fix cookies/session tests broken after merging key rotation.	Kasper Timm Hansen	2017-09-25	3	-37/+34
* \|	Merge pull request #30704 from ydakuka/new-fixes	Ryuta Kamizono	2017-09-25	2	-3/+3
\|\ \
\| * \|	new missing backquotes [ci skip]	Yauheni Dakuka	2017-09-25	2	-3/+3
* \| \|	Merge pull request #30706 from tgxworld/fix_preload_memoization	Ryuta Kamizono	2017-09-25	1	-6/+5
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	PERF: Restore memoization when preloading associations.	Guo Xiang Tan	2017-09-25	1	-6/+5
\|/ /
* \|	mocha 1.3.0	Akira Matsuda	2017-09-25	2	-3/+3
* \|	Unneeded Mocha stubs for Kernel#system	Akira Matsuda	2017-09-25	1	-2/+0
* \|	Extract `integer_like_primary_key_type` to ease to handle it for adapters	Ryuta Kamizono	2017-09-25	4	-17/+18
* \|	Merge pull request #30615 from yhirano55/update_form_helpers_guide	Ryuta Kamizono	2017-09-25	1	-7/+11
\|\ \
\| * \|	Update Form Helpers guide to fix example codes [ci skip]	Yoshiyuki Hirano	2017-09-17	1	-7/+11
* \| \|	Merge pull request #30698 from bogdanvlviv/remove-unused-variables-from-relea...	Ryuta Kamizono	2017-09-25	1	-1/+0
\|\ \ \
\| * \| \|	Remove unused variable `gem_version` from `tasks/release.rb`	bogdanvlviv	2017-09-24	1	-1/+0
* \| \| \|	Fix `test_should_sanitize_illegal_style_properties` failure	Ryuta Kamizono	2017-09-25	1	-2/+2
* \| \| \|	Skip complex cookie tests for now; I'll deal with them tomorrow.	Kasper Timm Hansen	2017-09-24	2	-0/+6
* \| \| \|	Fix RotationConfiguration test and remove nil-kind rotates.	Kasper Timm Hansen	2017-09-24	2	-29/+8
* \| \| \|	Fix "warning: `*' interpreted as argument prefix"	Ryuta Kamizono	2017-09-25	1	-2/+2
* \| \| \|	Merge pull request #30693 from yhirano55/refactor_css_scaffold_generator	Kasper Timm Hansen	2017-09-24	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Refactor Css::Generators::ScaffoldGenerator	Yoshiyuki Hirano	2017-09-25	1	-3/+3
* \| \| \| \|	[ci skip] Attempt a new explanation for rotations.	Kasper Timm Hansen	2017-09-24	4	-81/+60
* \| \| \| \|	Use new rotation signature in cookies.	Kasper Timm Hansen	2017-09-24	3	-73/+25
* \| \| \| \|	Remove advanced key generator rotations from verifier/encryptor.	Kasper Timm Hansen	2017-09-24	3	-198/+66
* \| \| \| \|	Infer options from the primary verifier.	Kasper Timm Hansen	2017-09-24	3	-12/+27
* \| \| \| \|	[ci skip] RotationConfiguration is an implementation detail, not public API.	Kasper Timm Hansen	2017-09-24	2	-8/+5
\| \|/ / / \|/\| \| \|
* \| \| \|	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