Merge remote-tracking branch 'upstream/pull/4383'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 23f70fc207c9fc20faad43ca8b0efde70ea8a6a3..e568c854052cb177b6f3cf69537ed47df17bbb6a 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
 module OpenStreetMap
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.

-    config.load_defaults 7.0
+    config.load_defaults 7.1

 
     # 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.
 
     # 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.


@@ -29,9 +29,6 @@ module OpenStreetMap
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql unless Settings.status == "database_offline"
 
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql unless Settings.status == "database_offline"
 

-    # Use rails 7.1 cache format
-    config.active_support.cache_format_version = 7.1
-

     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
 
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)