From c87030f9e5e13271b0daa78911c2b9ba03294acc Mon Sep 17 00:00:00 2001 From: Adrien Dessy Date: Fri, 20 Dec 2024 15:08:20 +0100 Subject: [PATCH] [TAN-3184] Delete new_framework_defaults_7_0.rb and load Rails 7.0 defaults --- back/config/application.rb | 8 +- .../new_framework_defaults_7_0.rb | 91 ------------------- 2 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 back/config/initializers/new_framework_defaults_7_0.rb diff --git a/back/config/application.rb b/back/config/application.rb index 22e64cd7b143..4d378033b68f 100644 --- a/back/config/application.rb +++ b/back/config/application.rb @@ -29,13 +29,7 @@ module Cl2Back class Application < Rails::Application require_dependency Rails.root.join('lib/citizen_lab') - # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.1 - - # TODO: Delete the following settings once we move to config.load_defaults 7.0 - config.active_support.disable_to_s_conversion = true - config.active_support.cache_format_version = 7.0 - config.active_record.partial_inserts = false + config.load_defaults 7.0 # Configuration for the application, engines, and railties goes here. # diff --git a/back/config/initializers/new_framework_defaults_7_0.rb b/back/config/initializers/new_framework_defaults_7_0.rb deleted file mode 100644 index ac9ade0c20b6..000000000000 --- a/back/config/initializers/new_framework_defaults_7_0.rb +++ /dev/null @@ -1,91 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. -# -# This file eases your Rails 7.0 framework defaults upgrade. -# -# Uncomment each configuration one by one to switch to the new default. -# Once your application is ready to run with all new defaults, you can remove -# this file and set the `config.load_defaults` to `7.0`. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. -# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html - -# `button_to` view helper will render `