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

	Commit message (Expand)	Author	Age	Files	Lines
*	Define the `url_options` needed for SytemTest inside the route proxy:	Edouard CHIN	2019-07-24	2	-5/+52
*	Merge pull request #36733 from ch3rub1m/fix-cache-timestamp-format-guide	Rafael França	2019-07-23	1	-1/+1
\|\
\| *	Fix cache_timestamp_format default value in guides	ch3rub1m	2019-07-23	1	-1/+1
* \|	Merge pull request #36724 from Edouard-chin/ec-to-h-errors	Rafael França	2019-07-23	2	-0/+16
\|\ \
\| * \|	Deprecated `AM::Errors#to_h`:	Edouard CHIN	2019-07-23	2	-0/+16
\| \|/
* \|	Improve changelog entry, remove extraneous word [ci skip]	Carlos Antonio da Silva	2019-07-23	1	-2/+2
* \|	Merge pull request #36666 from gmcgibbon/allow_disabling_active_storage_routes	Gannon McGibbon	2019-07-22	6	-1/+24
\|\ \
\| * \|	Make Active Storage routes optional	Gannon McGibbon	2019-07-22	6	-1/+24
\|/ /
* \|	Remove changelog entry for backported change	George Claghorn	2019-07-22	1	-7/+0
* \|	Merge pull request #36726 from Edouard-chin/ec-source-annotation-extractor-de...	Rafael França	2019-07-22	1	-5/+5
\|\ \
\| * \|	Move the deprecation call after the new class has been defined:	Edouard CHIN	2019-07-22	1	-5/+5
\| \|/
* \|	Merge pull request #36623 from alipman88/exclude_marshal_dump_from_delegate_m...	George Claghorn	2019-07-22	3	-2/+44
\|\ \ \| \|/ \|/\|
\| *	Omit marshal_dump & _dump from delegate_missing_to	Aaron Lipman	2019-07-17	3	-2/+44
* \|	Merge pull request #36723 from masakazutakewaka/fix_create_newline_between_bl...	Ryuta Kamizono	2019-07-22	2	-12/+51
\|\ \
\| * \|	create a newline between blocks when gem_group, github and add_source was cal...	masakazutakewaka	2019-07-21	2	-12/+51
\|/ /
* \|	Merge pull request #36721 from Edouard-chin/ec-errors-each	Carlos Antonio da Silva	2019-07-21	2	-1/+9
\|\ \
\| * \|	Fix deprecation on `AM::Errors` when each is called indirectly:	Edouard CHIN	2019-07-20	2	-1/+9
* \| \|	Merge pull request #35285 from masakazutakewaka/fix_railtie_add_newline_to_ge...	y-yagi	2019-07-21	2	-16/+63
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Append a newline to the Gemfile if it doesn't end with a newline	masakazutakewaka	2019-07-19	2	-16/+63
* \| \|	Preserve existing attachment assignment behavior for upgraded apps	George Claghorn	2019-07-20	9	-15/+117
* \| \|	Fix argument in doc sample of new `sms_to` helper [ci skip]	Carlos Antonio da Silva	2019-07-19	1	-1/+1
* \| \|	Merge pull request #36511 from aantix/sms_link_helper	Guillermo Iguaran	2019-07-19	2	-0/+110
\|\ \ \
\| * \| \|	Doc changes.	Jim Jones	2019-06-18	1	-4/+4
\| * \| \|	Helper method to create an sms link - when clicked it opens the phone/desktop...	Jim Jones	2019-06-18	2	-0/+110
* \| \| \|	Merge pull request #36713 from Shopify/fix-type-in-template	Kasper Timm Hansen	2019-07-19	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix a minor typo in ActionView::UnboundTemplate	Jean Boussier	2019-07-19	1	-3/+3
* \| \| \| \|	Merge pull request #36706 from kirs/dedup-optimizer-hints	Ryuta Kamizono	2019-07-19	2	-1/+8
\|\ \ \ \ \
\| * \| \| \| \|	[ActiveRecord] Deduplicate optimizer hints	Kir Shatrov	2019-07-19	2	-1/+8
* \| \| \| \| \|	Merge pull request #36712 from tekin/include-more-commands-in-rails-help-output	Eileen M. Uchitelle	2019-07-19	1	-4/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Include common commands in rails help output	Tekin Suleyman	2019-07-19	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge pull request #36710 from ypresto/patch-1	Ryuta Kamizono	2019-07-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ActionController] Fix send_file example for 404	Yuya Tanaka	2019-07-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #36703 from y-yagi/script-src-xxx_and_style-src-xxx	y-yagi	2019-07-19	2	-0/+28
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add support for script-src-attr / elem and style-src-attr / elem directives	yuuji.yaginuma	2019-07-18	2	-0/+28
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #36695 from kamipo/revert_unnecessary_change	Ryuta Kamizono	2019-07-18	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Revert "Merge pull request #36676 from wjessop/change_activestorage_metadata_...	Ryuta Kamizono	2019-07-17	1	-1/+1
* \| \| \|	Merge pull request #36603 from y-yagi/add_skip_collision_check_option	Yuji Yaginuma	2019-07-18	2	-2/+15
\|\ \ \ \
\| * \| \| \|	Add `skip-collision-check` option to generator	yuuji.yaginuma	2019-07-05	2	-2/+15
* \| \| \| \|	Merge pull request #36691 from Edouard-chin/ec-system-test-route	Rafael França	2019-07-17	2	-6/+13
\|\ \ \ \ \
\| * \| \| \| \|	Don't include routes helpers inside System test class:	Edouard CHIN	2019-07-16	2	-6/+13
* \| \| \| \| \|	Merge pull request #36700 from cpruitt/revert-36690-make-parameterize-require...	Eileen M. Uchitelle	2019-07-17	2	-15/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Revert "Make UTF-8 string requirement explicit for `ActiveSupport::Inflector....	Cliff Pruitt	2019-07-17	2	-15/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #36690 from cpruitt/make-parameterize-requires-utf-8-explicit	Eileen M. Uchitelle	2019-07-17	2	-2/+15
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make UTF-8 string requirement explicit for `transliterate`	Cliff Pruitt	2019-07-16	2	-2/+15
* \| \| \| \| \| \|	Merge pull request #36696 from inopinatus/support_beginless_ranges	Ryuta Kamizono	2019-07-17	3	-2/+30
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Support beginless ranges in hash conditions.	Josh Goodall	2019-07-17	3	-2/+30
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #36635 from abhaynikam/36332-fix-engine-documentation-to-r...	Kasper Timm Hansen	2019-07-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed the engine documentation to not mention of assets/javascripts in app di...	Abhay Nikam	2019-07-09	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #36694 from kirs/timeout-error-superclass	Rafael França	2019-07-16	3	-5/+12
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ActiveRecord] Superclass for aborted queries	Kir Shatrov	2019-07-16	3	-5/+12
\|/ / / / / / /