diff --git a/config/application.rb b/config/application.rb index b6059663f5..97d69a606b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,6 +35,7 @@ module Openfoodnetwork config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone] + config.active_support.cache_format_version = 7.0 # Please, add to the `ignore` list any other `lib` subdirectories that do # not contain `.rb` files, or that should not be reloaded or eager loaded. diff --git a/config/environments/test.rb b/config/environments/test.rb index 4042f0a351..8c7562aee0 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -74,9 +74,6 @@ Rails.application.configure do allowed_warnings = [ # List strings here to allow matching deprecations. # - # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#new-activesupport-cache-serialization-format - "config.active_support.cache_format_version", - # `Rails.application.secrets` is deprecated in favor of `Rails.application.credentials` and will be removed in Rails 7.2 "Rails.application.secrets", diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb index b13ef5ed16..45691b805d 100644 --- a/config/initializers/new_framework_defaults_7_0.rb +++ b/config/initializers/new_framework_defaults_7_0.rb @@ -93,16 +93,6 @@ # } -# ** Please read carefully, this must be configured in config/application.rb ** -# Change the format of the cache entry. -# Changing this default means that all new cache entries added to the cache -# will have a different format that is not supported by Rails 6.1 applications. -# Only change this value after your application is fully deployed to Rails 7.0 -# and you have no plans to rollback. -# When you're ready to change format, add this to `config/application.rb` (NOT this file): -# config.active_support.cache_format_version = 7.0 - - # Cookie serializer: 2 options # # If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer