From 3efb10f8fb6e143cd4a5970167e6c4b475644bb9 Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Tue, 27 Feb 2018 23:06:21 +0200 Subject: Fix `new_framework_defaults_6_0.rb` `default_enforce_utf8` belongs to `config.action_view` Update info about `:skip_enforcing_utf8` since we can change default behavior via `config.action_controller.default_enforce_utf8` Related to #32125 --- actionview/lib/action_view/helpers/form_helper.rb | 4 ++-- .../templates/config/initializers/new_framework_defaults_6_0.rb.tt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index 6fd66066c6..afd49286e6 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -610,8 +610,8 @@ module ActionView # unnecessary unless you support browsers without JavaScript. # * :local - By default form submits are remote and unobtrusive XHRs. # Disable remote submits with local: true. - # * :skip_enforcing_utf8 - By default a hidden field named +utf8+ - # is output to enforce UTF-8 submits. Set to true to skip the field. + # * :skip_enforcing_utf8 - If set to true, a hidden input with name + # utf8 is not output. # * :builder - Override the object used to build the form. # * :id - Optional HTML id attribute. # * :class - Optional HTML class attribute. diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt index bb620fb40f..179b97de4a 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt @@ -7,4 +7,4 @@ # Read the Guide for Upgrading Ruby on Rails for more info on each option. # Don't force requests from old versions of IE to be UTF-8 encoded -# Rails.application.config.action_controller.default_enforce_utf8 = false +# Rails.application.config.action_view.default_enforce_utf8 = false -- cgit v1.2.3