diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-02-27 22:40:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 22:40:20 -0500 |
| commit | ea86da84aa89f2e7532dfc9b33ea0b033b56f16c (patch) | |
| tree | b54f45a1269a78ce9a741d32d102f56ab634d750 | |
| parent | d004f0acf8bba32a4e6df8dc95824df70560c840 (diff) | |
| parent | 3efb10f8fb6e143cd4a5970167e6c4b475644bb9 (diff) | |
| download | rails-ea86da84aa89f2e7532dfc9b33ea0b033b56f16c.tar.gz rails-ea86da84aa89f2e7532dfc9b33ea0b033b56f16c.tar.bz2 rails-ea86da84aa89f2e7532dfc9b33ea0b033b56f16c.zip | |
Merge pull request #32131 from bogdanvlviv/fix-new_framework_defaults_6_0
Fix `new_framework_defaults_6_0.rb`
| -rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/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. # * <tt>:local</tt> - By default form submits are remote and unobtrusive XHRs. # Disable remote submits with <tt>local: true</tt>. - # * <tt>:skip_enforcing_utf8</tt> - By default a hidden field named +utf8+ - # is output to enforce UTF-8 submits. Set to true to skip the field. + # * <tt>:skip_enforcing_utf8</tt> - If set to true, a hidden input with name + # utf8 is not output. # * <tt>:builder</tt> - Override the object used to build the form. # * <tt>:id</tt> - Optional HTML id attribute. # * <tt>:class</tt> - 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 |