diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt index c1694171a8..bd82ea0a07 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt @@ -46,11 +46,13 @@ # "-vf select=eq(n\,0)+eq(key\,1)+gt(scene\,0.015),loop=loop=-1:size=2,trim=start_frame=1 -frames:v 1 -f image2" # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer -# was `:marshal`. Continue to use that for backward-compatibility with old cookies. -# If you have configured the serializer elsewhere, you can remove this. +# was `:marshal`. Convert all cookies to JSON, using the `:hybrid` formatter. # -# To convert all cookies to JSON, use the `:hybrid` formatter. # If you're confident all your cookies are JSON formatted, you can switch to the `:json` formatter. # +# Continue to use `:marshal` for backward-compatibility with old cookies. +# +# If you have configured the serializer elsewhere, you can remove this. +# # See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information. -# Rails.application.config.action_dispatch.cookies_serializer = :marshal +# Rails.application.config.action_dispatch.cookies_serializer = :hybrid