From 1f67318f84cc0860706de9dbc47614548ebf7926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 25 Sep 2021 03:38:49 +0200 Subject: [PATCH] Delete configuration options that are now redundant These options are the default options in Rails 6.1, so we no longer need to customize them. --- config/application.rb | 8 -------- config/initializers/new_framework_defaults_6_1.rb | 9 --------- 2 files changed, 17 deletions(-) diff --git a/config/application.rb b/config/application.rb index 1ddf08893..1ee5de29c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -27,9 +27,6 @@ module Consul # Rails 4 models worked config.active_record.belongs_to_required_by_default = false - # Use local forms with `form_with`, so it works like `form_for` - config.action_view.form_with_generates_remote_forms = false - # Keep using AES-256-CBC for message encryption in case it's used # in any CONSUL DEMOCRACY installations config.active_support.use_authenticated_message_encryption = false @@ -38,11 +35,6 @@ module Consul # should work with zeitwerk config.autoloader = :classic - # Use the default queue for ActiveStorage like we were doing with Rails 5.2 - # because it will also be the default in Rails 6.1. - config.active_storage.queues.analysis = nil - config.active_storage.queues.purge = nil - # Keep reading existing data in the legislation_annotations ranges column config.active_record.yaml_column_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol] diff --git a/config/initializers/new_framework_defaults_6_1.rb b/config/initializers/new_framework_defaults_6_1.rb index 9526b835a..9f071cc05 100644 --- a/config/initializers/new_framework_defaults_6_1.rb +++ b/config/initializers/new_framework_defaults_6_1.rb @@ -44,15 +44,6 @@ # support for granular connection swapping. # Rails.application.config.active_record.legacy_connection_handling = false -# Make `form_with` generate non-remote forms by default. -# Rails.application.config.action_view.form_with_generates_remote_forms = false - -# Set the default queue name for the analysis job to the queue adapter default. -# Rails.application.config.active_storage.queues.analysis = nil - -# Set the default queue name for the purge job to the queue adapter default. -# Rails.application.config.active_storage.queues.purge = nil - # Set the default queue name for the incineration job to the queue adapter default. # Rails.application.config.action_mailbox.queues.incineration = nil