Skip to content

Commit e9559f4

Browse files
authored
Merge pull request rails#42722 from p8/railties/add-missing-new-defaults
Add missing new defaults to new_framework_defaults_7_0.rb.tt
2 parents 2d1e6ae + 4d3a8a0 commit e9559f4

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

guides/source/configuring.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,9 @@ text/javascript image/svg+xml application/postscript application/x-shockwave-fla
10981098
- `config.active_support.key_generator_hash_digest_class`: `OpenSSL::Digest::SHA256`
10991099
- `config.active_support.hash_digest_class`: `OpenSSL::Digest::SHA256`
11001100
- `config.active_support.cache_format_version`: `7.0`
1101+
- `config.active_support.remove_deprecated_time_with_zone_name` : `true`
11011102
- `config.action_dispatch.return_only_request_media_type_on_content_type`: `false`
1103+
- `config.action_controller.silence_disabled_session_errors` : `false`
11021104
- `config.action_mailer.smtp_timeout`: `5`
11031105
- `config.active_storage.video_preview_arguments`: `"-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"`
11041106

railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#
99
# Read the Guide for Upgrading Ruby on Rails for more info on each option.
1010

11+
# Raise an error when trying to use forgery protection without a working
12+
# session.
13+
# Rails.application.config.action_controller.silence_disabled_session_errors = false
14+
1115
# `button_to` view helper will render `<button>` element, regardless of whether
1216
# or not the content is passed as the first argument or as a block.
1317
# Rails.application.config.action_view.button_to_generates_button_tag = true
@@ -29,6 +33,10 @@
2933
# various cache keys leading to cache invalidation.
3034
# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
3135

36+
# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
37+
# implementation.
38+
# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
39+
3240
# Change the format of the cache entry.
3341
# Changing this default means that all new cache entries added to the cache
3442
# will have a different format that is not supported by Rails 6.1 applications.

0 commit comments

Comments
 (0)