From 2c69afd3a15616379a3e1bb103931899e6c550f9 Mon Sep 17 00:00:00 2001 From: vangberg Date: Thu, 18 Jun 2026 11:30:26 +0200 Subject: [PATCH 1/3] load 6.1 defaults --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index d3bd5efb..d4e26215 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ module CandidatusExcubia class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 5.1 + config.load_defaults 6.1 # Boolean handling of SQLite3 config.active_record.sqlite3&.represent_boolean_as_integer = true From 79790da24b931242501cd504d65df1e1c26f794a Mon Sep 17 00:00:00 2001 From: vangberg Date: Thu, 18 Jun 2026 11:30:46 +0200 Subject: [PATCH 2/3] local: true is the new default in 6.1 https://lilyreile.medium.com/rails-6-1-new-framework-defaults-what-they-do-and-how-to-safely-uncomment-them-c546b70f0c5e --- app/views/authors/_form.html.erb | 2 +- app/views/names/_form.html.erb | 2 +- app/views/publications/_form.html.erb | 2 +- app/views/subjects/_form.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/authors/_form.html.erb b/app/views/authors/_form.html.erb index 0dba9666..57dd8745 100644 --- a/app/views/authors/_form.html.erb +++ b/app/views/authors/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with(model: author, local: true) do |form| %> +<%= form_with(model: author) do |form| %> <% if author.errors.any? %>

<%= pluralize(author.errors.count, "error") %> prohibited this author from being saved:

diff --git a/app/views/names/_form.html.erb b/app/views/names/_form.html.erb index b2f61613..e42b0639 100644 --- a/app/views/names/_form.html.erb +++ b/app/views/names/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with(model: name, local: true) do |f| %> +<%= form_with(model: name) do |f| %> <% if name.errors.any? %>

<%= pluralize(name.errors.count, "error") %> prohibited this name from being saved:

diff --git a/app/views/publications/_form.html.erb b/app/views/publications/_form.html.erb index 2944bb41..e1c5f0c7 100644 --- a/app/views/publications/_form.html.erb +++ b/app/views/publications/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with(model: publication, local: true) do |form| %> +<%= form_with(model: publication) do |form| %> <% if publication.errors.any? %>

<%= pluralize(publication.errors.count, 'error') %> diff --git a/app/views/subjects/_form.html.erb b/app/views/subjects/_form.html.erb index 7f7677b6..832708ab 100644 --- a/app/views/subjects/_form.html.erb +++ b/app/views/subjects/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_with(model: subject, local: true) do |form| %> +<%= form_with(model: subject) do |form| %> <% if subject.errors.any? %>

<%= pluralize(subject.errors.count, "error") %> prohibited this subject from being saved:

From 3bdb327a548634d78bcee6f3127c5af0f5b0422c Mon Sep 17 00:00:00 2001 From: vangberg Date: Thu, 18 Jun 2026 11:30:46 +0200 Subject: [PATCH 3/3] remove new_framework_defaults --- .../new_framework_defaults_6_0.rb | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 config/initializers/new_framework_defaults_6_0.rb diff --git a/config/initializers/new_framework_defaults_6_0.rb b/config/initializers/new_framework_defaults_6_0.rb deleted file mode 100644 index 92240ef5..00000000 --- a/config/initializers/new_framework_defaults_6_0.rb +++ /dev/null @@ -1,45 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 6.0 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Don't force requests from old versions of IE to be UTF-8 encoded. -# Rails.application.config.action_view.default_enforce_utf8 = false - -# Embed purpose and expiry metadata inside signed and encrypted -# cookies for increased security. -# -# This option is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 6.0. -# Rails.application.config.action_dispatch.use_cookies_with_metadata = true - -# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification. -# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false - -# Return false instead of self when enqueuing is aborted from a callback. -# Rails.application.config.active_job.return_false_on_aborted_enqueue = true - -# Send Active Storage analysis and purge jobs to dedicated queues. -# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis -# Rails.application.config.active_storage.queues.purge = :active_storage_purge - -# When assigning to a collection of attachments declared via `has_many_attached`, replace existing -# attachments instead of appending. Use #attach to add new attachments without replacing existing ones. -# Rails.application.config.active_storage.replace_on_assign_to_many = true - -# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail. -# -# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob), -# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions. -# If you send mail in the background, job workers need to have a copy of -# MailDeliveryJob to ensure all delivery jobs are processed properly. -# Make sure your entire app is migrated and stable on 6.0 before using this setting. -# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" - -# Enable the same cache key to be reused when the object being cached of type -# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count) -# of the relation's cache key into the cache version to support recycling cache key. -# Rails.application.config.active_record.collection_cache_versioning = true