Merge pull request #2452 from UKGovernmentBEIS/chore/use-rails-6.1-de…

…faults Use Rails 6.1 defaults
UKGovernmentBEIS · Dec 4, 2024 · 0c5d52e · 0c5d52e
2 parents ac1fc9e + ef4263d
commit 0c5d52e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Remove Spring from development
 - Switch to the Zeitwerk autoloader
+- Use Rails 6.1 default configuration
 
 ## Release 153 - 2024-12-02
 

diff --git a/config/application.rb b/config/application.rb
@@ -37,7 +37,7 @@ class Application < Rails::Application
     end
 
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb