From fecbdd4f390ec54732f1d2b3be8d9377b65f621b Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Tue, 16 Dec 2025 11:50:09 -0800
Subject: [PATCH 01/10] AO3-7231 Bump Rails version, run update task

---
 Gemfile                                       |   8 +-
 Gemfile.lock                                  | 137 ++++++++--------
 app/controllers/errors_controller.rb          |   2 +-
 app/views/errors/400.html.erb                 |   3 +
 bin/dev                                       |   2 +
 bin/setup                                     |  13 +-
 config/application.rb                         |   2 +-
 config/environments/development.rb            |  25 +--
 config/environments/production.rb             |  18 +-
 config/environments/test.rb                   |  10 +-
 .../initializers/filter_parameter_logging.rb  |   3 +-
 .../new_framework_defaults_8_0.rb             |  30 ++++
 config/routes.rb                              |   1 +
 public/400.html                               | 155 ++++++++++++++++++
 spec/controllers/errors_controller_spec.rb    |   8 +
 15 files changed, 299 insertions(+), 118 deletions(-)
 create mode 100644 app/views/errors/400.html.erb
 create mode 100755 bin/dev
 create mode 100644 config/initializers/new_framework_defaults_8_0.rb
 create mode 100644 public/400.html

diff --git a/Gemfile b/Gemfile
index 6d5fac6fe2b..2321f84bf5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,8 +6,8 @@ gem 'test-unit', '~> 3.2'
 
 gem 'bundler'
 
-gem "rails", "~> 7.2"
-gem "rails-i18n"
+gem "rails", "~> 8.0.0"
+gem "rails-i18n", "~> 8.0.0"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
 
@@ -107,13 +107,13 @@ gem 'kgio', '2.10.0'
 gem "marcel", "1.0.2"
 
 # Library for helping run pt-online-schema-change commands:
-gem "departure", "~> 6.8"
+gem "departure", "~> 8.0"
 
 gem "rack-timeout"
 gem "puma_worker_killer"
 
 group :test do
-  gem "rspec-rails", "~> 6.0"
+  gem "rspec-rails", "~> 8.0"
   gem 'pickle'
   gem 'shoulda'
   gem "capybara"
diff --git a/Gemfile.lock b/Gemfile.lock
index e6e5924ca23..0d9001b8203 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,32 +15,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     aaronh-chronic (0.3.9)
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (8.0.4)
+      actionpack (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activesupport (= 8.0.4)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (8.0.4)
+      actionview (= 8.0.4)
+      activesupport (= 8.0.4)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
@@ -48,37 +47,37 @@ GEM
       useragent (~> 0.16)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (8.0.4)
+      actionpack (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (8.0.4)
+      activesupport (= 8.0.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_query_trace (1.8.3)
       activerecord (>= 6.0.0)
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (8.0.4)
+      activesupport (= 8.0.4)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (8.0.4)
+      activesupport (= 8.0.4)
+    activerecord (8.0.4)
+      activemodel (= 8.0.4)
+      activesupport (= 8.0.4)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (8.0.4)
+      actionpack (= 8.0.4)
+      activejob (= 8.0.4)
+      activerecord (= 8.0.4)
+      activesupport (= 8.0.4)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (8.0.4)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -90,6 +89,7 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
     addressable (2.8.7)
@@ -217,10 +217,10 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    departure (6.8.0)
-      activerecord (>= 6.0.0, < 7.3.0, != 7.0.0)
+    departure (8.0.0)
+      activerecord (>= 7.2.0)
       mysql2 (>= 0.4.0, < 0.6.0)
-      railties (>= 6.0.0, < 7.3.0, != 7.0.0)
+      railties (>= 7.2.0)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -456,20 +456,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (8.0.4)
+      actioncable (= 8.0.4)
+      actionmailbox (= 8.0.4)
+      actionmailer (= 8.0.4)
+      actionpack (= 8.0.4)
+      actiontext (= 8.0.4)
+      actionview (= 8.0.4)
+      activejob (= 8.0.4)
+      activemodel (= 8.0.4)
+      activerecord (= 8.0.4)
+      activestorage (= 8.0.4)
+      activesupport (= 8.0.4)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 8.0.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -481,16 +481,17 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.9)
+    rails-i18n (8.0.2)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+      railties (>= 8.0.0, < 9)
+    railties (8.0.4)
+      actionpack (= 8.0.4)
+      activesupport (= 8.0.4)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
@@ -535,10 +536,10 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.5)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
@@ -698,7 +699,7 @@ DEPENDENCIES
   cucumber-timecop
   dalli
   database_cleaner
-  departure (~> 6.8)
+  departure (~> 8.0)
   devise
   devise-async
   devise-pwned_password
@@ -740,9 +741,9 @@ DEPENDENCIES
   rack-attack
   rack-dev-mark (>= 0.7.8)
   rack-timeout
-  rails (~> 7.2)
+  rails (~> 8.0.0)
   rails-controller-testing
-  rails-i18n
+  rails-i18n (~> 8.0.0)
   rails-observers!
   redis (< 5.0)
   redis-namespace
@@ -750,7 +751,7 @@ DEPENDENCIES
   resque-scheduler
   rest-client (~> 2.1.0)
   rollout
-  rspec-rails (~> 6.0)
+  rspec-rails (~> 8.0)
   rubocop (= 1.22.3)
   rubocop-rails (= 2.12.4)
   rubocop-rspec (= 2.6.0)
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index c78a0dfe4df..9efe5c9e73f 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,5 +1,5 @@
 class ErrorsController < ApplicationController
-  %w[403 404 422 500].each do |error_code|
+  %w[400 403 404 422 500].each do |error_code|
     define_method error_code.to_sym do
       render error_code, status: error_code.to_i, formats: :html
     end
diff --git a/app/views/errors/400.html.erb b/app/views/errors/400.html.erb
new file mode 100644
index 00000000000..4c5e0fdd9c6
--- /dev/null
+++ b/app/views/errors/400.html.erb
@@ -0,0 +1,3 @@
+<h2 class="heading">Error 400</h2>
+<h3 class="heading">Bad Request</h3>
+<p>The server cannot process the request due to a client error.</p>
diff --git a/bin/dev b/bin/dev
new file mode 100755
index 00000000000..5f91c205453
--- /dev/null
+++ b/bin/dev
@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV
diff --git a/bin/setup b/bin/setup
index 84cd6312957..be3db3c0d62 100755
--- a/bin/setup
+++ b/bin/setup
@@ -2,7 +2,6 @@
 require "fileutils"
 
 APP_ROOT = File.expand_path("..", __dir__)
-APP_NAME = "otwarchive"
 
 def system!(*args)
   system(*args, exception: true)
@@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
@@ -28,10 +26,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Restarting application server =="
-  system! "bin/rails restart"
-
-  # puts "\n== Configuring puma-dev =="
-  # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}"
-  # system "curl -Is https://#{APP_NAME}.test/up | head -n 1"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end
diff --git a/config/application.rb b/config/application.rb
index 6144a8695a1..dfb3530c97e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -105,7 +105,7 @@ class Application < Rails::Application
     # Use Resque to run ActiveJobs (including sending delayed mail):
     config.active_job.queue_adapter = :resque
 
-    # TODO: Remove with Rails 8.0 where this option will be deprecated
+    # todo(8.0): Remove with Rails 8.0 where this option will be deprecated
     config.active_job.enqueue_after_transaction_commit = :always
 
     config.active_model.i18n_customize_full_message = true
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 894a33f63e0..b8c30aa860c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -3,9 +3,7 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded any time
-  # it changes. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
+  # Make code changes take effect immediately without server restart.
   config.enable_reloading = true
 
   # Do not eager load code on boot.
@@ -17,8 +15,8 @@
   # Enable server timing.
   config.server_timing = true
 
-  # Enable/disable caching. By default caching is disabled.
-  # Run rails dev:cache to toggle caching.
+  # Enable/disable Action Controller caching. By default Action Controller caching is disabled.
+  # Run rails dev:cache to toggle Action Controller caching.
   if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
@@ -28,7 +26,7 @@
     config.cache_store = :mem_cache_store, memcached_servers,
                          { namespace: "ao3-v2-dev", compress: true, pool: { size: 10 } }
     config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.to_i}"
+      "cache-control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -42,28 +40,21 @@
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Disable caching for Action Mailer templates even if Action Controller
-  # caching is enabled.
+  # Make template changes take effect immediately.
   config.action_mailer.perform_caching = false
 
-  # Enable mailer previews at http://localhost:3000/rails/mailers.
-  config.action_mailer.show_previews = true
-
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise exceptions for disallowed deprecations.
-  config.active_support.disallowed_deprecation = :raise
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
-
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
+  # Append comments with runtime information tags to SQL queries in logs.
+  config.active_record.query_log_tags_enabled = true
+
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6297a710732..7d893b15edc 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,3 @@
-require "active_support/core_ext/integer/time"
-
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -8,14 +6,13 @@
   # Code is not reloaded between requests.
   config.enable_reloading = false
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
+  # Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
   config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on.
+  # Full error reports are disabled.
   config.consider_all_requests_local = false
+
+  # Turn on fragment caching in view templates.
   config.action_controller.perform_caching = true
 
   # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
@@ -74,10 +71,10 @@
   # config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "error")
 
-  # Use a different cache store in production.
+  # Replace the default in-process memory cache store with a durable alternative.
   # config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment).
+  # Replace the default in-process and non-durable queuing backend for Active Job.
   # config.active_job.queue_adapter = :resque
   # config.active_job.queue_name_prefix = "otwarchive_production"
 
@@ -102,13 +99,14 @@
   config.active_record.dump_schema_after_migration = false
 
   # Only use :id for inspections in production.
-  # config.active_record.attributes_for_inspect = [:id]
+  # config.active_record.attributes_for_inspect = [ :id ]
 
   # Enable DNS rebinding protection and other `Host` header attacks.
   # config.hosts = [
   #   "example.com",     # Allow requests from example.com
   #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
   # ]
+  #
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index b7395ff1adf..5244359bdc5 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -17,8 +17,8 @@
   # loading is working properly before deploying your code.
   config.eager_load = ENV["CI"].present?
 
-  # Configure public file server for tests with Cache-Control for performance.
-  config.public_file_server.headers = { "Cache-Control" => "public, max-age=#{1.hour.to_i}" }
+  # Configure public file server for tests with cache-control for performance.
+  config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.hour.to_i}" }
 
   # Show full error reports and enable caching.
   config.consider_all_requests_local = true
@@ -57,12 +57,6 @@
   config.action_controller.default_url_options = { host: "www.example.com", port: nil }
   config.action_mailer.default_url_options = config.action_controller.default_url_options.merge(protocol: "https")
 
-  # Raise exceptions for disallowed deprecations.
-  config.active_support.disallowed_deprecation = :raise
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
-
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 63b12954396..538625f15f8 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -4,7 +4,8 @@
 # Use this to limit dissemination of sensitive information.
 # See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :content, :passw, :terms_of_service_non_production, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc,
+  :content, :terms_of_service_non_production
 ]
 
 # IMPORTANT! Rails.application.config.filter_parameters must be set *above* in this file
diff --git a/config/initializers/new_framework_defaults_8_0.rb b/config/initializers/new_framework_defaults_8_0.rb
new file mode 100644
index 00000000000..92efa951524
--- /dev/null
+++ b/config/initializers/new_framework_defaults_8_0.rb
@@ -0,0 +1,30 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 8.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 `8.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+###
+# Specifies whether `to_time` methods preserve the UTC offset of their receivers or preserves the timezone.
+# If set to `:zone`, `to_time` methods will use the timezone of their receivers.
+# If set to `:offset`, `to_time` methods will use the UTC offset.
+# If `false`, `to_time` methods will convert to the local system UTC offset instead.
+#++
+# Rails.application.config.active_support.to_time_preserves_timezone = :zone
+
+###
+# When both `If-Modified-Since` and `If-None-Match` are provided by the client
+# only consider `If-None-Match` as specified by RFC 7232 Section 6.
+# If set to `false` both conditions need to be satisfied.
+#++
+# Rails.application.config.action_dispatch.strict_freshness = true
+
+###
+# Set `Regexp.timeout` to `1`s by default to improve security over Regexp Denial-of-Service attacks.
+#++
+# Regexp.timeout = 1
diff --git a/config/routes.rb b/config/routes.rb
index d41f9761074..fd5b2804e2a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,7 @@
 
   #### ERRORS ####
 
+  get '/400', to: 'errors#400'
   get '/403', to: 'errors#403'
   get '/404', to: 'errors#404'
   get '/422', to: 'errors#422'
diff --git a/public/400.html b/public/400.html
new file mode 100644
index 00000000000..d9123dbfd29
--- /dev/null
+++ b/public/400.html
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="x-ua-compatible" content="ie=edge" />
+  <meta name="keywords" content="fanfiction, transformative works, otw, fair use, archive" />
+  <meta name="language" content="en-US" />
+  <meta name="subject" content="fandom" />
+  <meta name="description" content="An Archive of Our Own, a project of the
+    Organization for Transformative Works" />
+  <meta name="distribution" content="GLOBAL" />
+  <meta name="classification" content="transformative works" />
+  <meta name="author" content="Organization for Transformative Works" />
+  <title>
+    Bad Request | Archive of Our Own
+  </title>
+  <link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/skins/skin_1_default/1_site_screen_.css">
+  <link rel="stylesheet" type="text/css" media="only screen and (max-width: 62em), handheld" href="/stylesheets/skins/skin_1_default/4_site_midsize.handheld_.css">
+  <link rel="stylesheet" type="text/css" media="only screen and (max-width: 42em), handheld" href="/stylesheets/skins/skin_1_default/5_site_narrow.handheld_.css">
+  <link rel="stylesheet" type="text/css" media="speech" href="/stylesheets/skins/skin_1_default/6_site_speech_.css">
+  <link rel="stylesheet" type="text/css" media="print" href="/stylesheets/skins/skin_1_default/7_site_print_.css">
+  <!--[if IE 8]><link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/skins/skin_1_default/8_site_screen_IE8_or_lower.css"><![endif]-->
+  <!--[if IE 5]><link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/skins/skin_1_default/9_site_screen_IE5.css"><![endif]-->
+  <!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/skins/skin_1_default/10_site_screen_IE6.css"><![endif]-->
+  <!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/skins/skin_1_default/11_site_screen_IE7.css"><![endif]-->
+  <link href="/stylesheets/sandbox.css" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="outer" class="wrapper">
+  <ul id="skiplinks"><li><a href="#main">Main Content</a></li></ul>
+  <!-- BEGIN header -->
+  <header id="header" class="region">
+    <h1 class="heading">
+      <a href="/"><span>Archive of Our Own</span><sup> beta</sup><img alt="Archive of Our Own" class="logo" src="/images/ao3_logos/logo_42.png?1362864128" /></a>
+    </h1>
+
+    <nav aria-label="Site">
+      <ul class="primary navigation actions">
+        <li class="dropdown">
+          <a href="/menu/fandoms">Fandoms</a>
+          <ul class="menu">
+            <li><a href="/media">All Fandoms</a></li>
+            <li id="medium_5"><a href="/media/Anime%20*a*%20Manga/fandoms">Anime &amp; Manga</a></li>
+            <li id="medium_3"><a href="/media/Books%20*a*%20Literature/fandoms">Books &amp; Literature</a></li>
+            <li id="medium_4"><a href="/media/Cartoons%20*a*%20Comics%20*a*%20Graphic%20Novels/fandoms">Cartoons &amp; Comics &amp; Graphic Novels</a></li>
+            <li id="medium_7"><a href="/media/Celebrities%20*a*%20Real%20People/fandoms">Celebrities &amp; Real People</a></li>
+            <li id="medium_2"><a href="/media/Movies/fandoms">Movies</a></li>
+            <li id="medium_6"><a href="/media/Music%20*a*%20Bands/fandoms">Music &amp; Bands</a></li>
+            <li id="medium_8"><a href="/media/Other%20Media/fandoms">Other Media</a></li>
+            <li id="medium_30198"><a href="/media/Theater/fandoms">Theater</a></li>
+            <li id="medium_1"><a href="/media/TV%20Shows/fandoms">TV Shows</a></li>
+            <li id="medium_476"><a href="/media/Video%20Games/fandoms">Video Games</a></li>
+            <li id="medium_9971"><a href="/media/Uncategorized%20Fandoms/fandoms">Uncategorized Fandoms</a></li>
+          </ul>
+        </li>
+        <li class="dropdown">
+          <a href="/menu/browse">Browse</a>
+          <ul class="menu">
+            <li><a href="/works">Works</a></li>
+            <li><a href="/bookmarks">Bookmarks</a></li>
+            <li><a href="/tags">Tags</a></li>
+            <li><a href="/collections">Collections</a></li>
+          </ul>
+        </li>
+        <li class="dropdown">
+          <a href="/menu/search">Search</a>
+          <ul class="menu">
+            <li><a href="/works/search">Works</a></li>
+            <li><a href="/bookmarks/search">Bookmarks</a></li>
+            <li><a href="/tags/search">Tags</a></li>
+            <li><a href="/people/search">People</a></li>
+          </ul>
+        </li>
+        <li class="dropdown">
+          <a href="/menu/about">About</a>
+          <ul class="menu">
+            <li><a href="/about">About Us</a></li>
+            <li><a href="/admin_posts">News</a></li>
+            <li><a href="/faq">FAQ</a></li>
+            <li><a href="/wrangling_guidelines">Wrangling Guidelines</a></li>
+            <li><a href="/donate">Donate or Volunteer</a></li>
+          </ul>
+        </li>
+        <li class="search"><form accept-charset="UTF-8" action="/works/search" class="search" id="search" role="search" aria-label="Work" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
+          <fieldset>
+            <p>
+              <label class="landmark" for="site_search">Work Search</label>
+              <input aria-describedby="site_search_tooltip" class="text" id="site_search" name="work_search[query]" type="text">
+              <span class="tip" role="tooltip" id="site_search_tooltip">tip: lex m/m (mature OR explicit)</span>
+              <span class="submit actions"><input class="button" type="submit" value="Search" /></span>
+            </p>
+          </fieldset>
+        </form>
+        </li>
+      </ul>
+    </nav>
+    <div class="clear"></div>
+  </header>
+  <!-- END header -->
+  <div id="inner" class="wrapper">
+    <div id="main" class="system errors error-400 region" role="main">
+      <h2 class="heading">Error 400</h2>
+      <h3 class="heading">The server cannot process the request due to a client error.</h3>
+      <p>If you are receiving this error repeatedly, please <a href="/support">contact Support</a>. In the form, please include a link to the page you're trying to reach and how you're trying to reach this page.</p>
+    </div>
+    <!-- END main -->
+  </div>
+  <div id="footer" role="contentinfo" class="region">
+    <h3 class="landmark heading">Footer</h3>
+    <ul class="navigation actions">
+      <li class="module group">
+        <h4 class="heading">About the Archive</h4>
+        <ul class="menu">
+          <li><a href="/site_map">Site Map</a></li>
+          <li><a href="/diversity">Diversity Statement</a></li>
+          <li><a href="/tos">Terms of Service</a></li>
+          <li><a href="/content">Content Policy</a></li>
+          <li><a href="/privacy">Privacy Policy</a></li>
+          <li><a href="/dmca">DMCA Policy</a></li>
+          <li><a href="https://www.otwstatus.org">Site Status</a></li>
+        </ul>
+      </li>
+      <li class="module group">
+        <h4 class="heading">Contact Us</h4>
+        <ul class="menu">
+          <li><a href="/abuse_reports/new">Policy Questions & Abuse Reports</a></li>
+          <li><a href="/support">Technical Support & Feedback</a></li>
+        </ul>
+      </li>
+      <li class="module group">
+        <h4 class="heading">Development</h4>
+        <ul class="menu">
+          <li><a href="/known_issues">Known Issues</a></li>
+          <li><a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" title="View License">GPL-2.0-or-later</a> by the <a href="https://transformativeworks.org/" title="The Organization for Transformative Works">OTW</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+  <!-- END footer -->
+</div>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js" type="text/javascript"></script>
+<!-- if user has googleapis blocked for some reason we need a fallback -->
+<script type="text/javascript">
+  if (typeof jQuery == 'undefined')
+  {
+    document.write(unescape("%3Cscript src='/javascripts/jquery.min.js' type='text/javascript'%3E%3C/script%3E"));
+    document.write(unescape("%3Cscript src='/javascripts/jquery-ui.min.js' type='text/javascript'%3E%3C/script%3E"));
+  }
+</script>
+<script type="text/javascript">$j = jQuery.noConflict();</script>
+<script src="/javascripts/application.js" type="text/javascript"></script>
+<script src="/javascripts/bootstrap/bootstrap-dropdown.js" type="text/javascript"></script>
+</body>
+</html>
diff --git a/spec/controllers/errors_controller_spec.rb b/spec/controllers/errors_controller_spec.rb
index 0504f2b248c..c699a197da0 100644
--- a/spec/controllers/errors_controller_spec.rb
+++ b/spec/controllers/errors_controller_spec.rb
@@ -1,6 +1,14 @@
 require "spec_helper"
 
 describe ErrorsController do
+  describe "400" do
+    it "returns an HTML 400 page" do
+      get :"400"
+      expect(response.status).to eq(400)
+      expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
+    end
+  end
+  
   describe "404" do
     it "returns an HTML 404 page for .html" do
       get :"404", params: { format: :html }

From 8fd90f08c46dbef6739c809757ec9d66623876e7 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Tue, 16 Dec 2025 14:27:25 -0800
Subject: [PATCH 02/10] AO3-7231 Temporarily use alternative rails-i18n source

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2321f84bf5a..dd304fb6bd0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'test-unit', '~> 3.2'
 gem 'bundler'
 
 gem "rails", "~> 8.0.0"
-gem "rails-i18n", "~> 8.0.0"
+gem "rails-i18n", "~> 8.0", git: "https://github.com/marcus8448/rails-i18n", ref: "1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d9001b8203..3073d61d267 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/marcus8448/rails-i18n
+  revision: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
+  ref: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
+  specs:
+    rails-i18n (8.1.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
+
 GIT
   remote: https://github.com/rails/rails-observers
   revision: 389b577322d8b17336730b2dc4e179060a23c8e7
@@ -481,9 +490,6 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (8.0.2)
-      i18n (>= 0.7, < 2)
-      railties (>= 8.0.0, < 9)
     railties (8.0.4)
       actionpack (= 8.0.4)
       activesupport (= 8.0.4)
@@ -743,7 +749,7 @@ DEPENDENCIES
   rack-timeout
   rails (~> 8.0.0)
   rails-controller-testing
-  rails-i18n (~> 8.0.0)
+  rails-i18n (~> 8.0)!
   rails-observers!
   redis (< 5.0)
   redis-namespace

From b119a348fddb9cb47df2eaaafcb1bcc3dce1b831 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Wed, 17 Dec 2025 20:52:50 -0800
Subject: [PATCH 03/10] AO3-7231 Don't touch owned tag set if it hasn't been
 persisted yet

---
 app/models/tagset_models/tag_set.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/tagset_models/tag_set.rb b/app/models/tagset_models/tag_set.rb
index 8a237d2d723..4ea7197f7a2 100644
--- a/app/models/tagset_models/tag_set.rb
+++ b/app/models/tagset_models/tag_set.rb
@@ -116,7 +116,7 @@ def remove_from_set(tags_to_remove)
     return unless tags_to_remove.present?
     self.set_taggings.where(tag_id: tags_to_remove.map(&:id)).delete_all
     remove_tags_from_autocomplete(tags_to_remove)
-    owned_tag_set&.touch
+    owned_tag_set.touch if owned_tag_set&.persisted?
   end
 
   def add_to_set(tags_to_add)
@@ -127,7 +127,7 @@ def add_to_set(tags_to_add)
       self.set_taggings.create(tag_id: tag.id)
     end
     add_tags_to_autocomplete(tags_to_add)
-    owned_tag_set&.touch
+    owned_tag_set.touch if owned_tag_set&.persisted?
   end
 
   # Tags must already exist unless they are being added to an owned tag set

From d021bef70b5c443767261130c511f588f68680f2 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Wed, 17 Dec 2025 21:24:01 -0800
Subject: [PATCH 04/10] AO3-7231 Attempt a test run with 8.0 defaults

Looked at all uses of to_time:
* used for duration (difference, so zone vs offset doesn't matter)
* stored in model/DB (rails converts to UTC)
* read from model and sent to akismet (rails converts to UTC)
* or just forced to utc

strict_freshness: I don't see any issues arising from it

Regexp.timeout: in my mind, 1s should be sufficient
---
 config/initializers/new_framework_defaults_8_0.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/initializers/new_framework_defaults_8_0.rb b/config/initializers/new_framework_defaults_8_0.rb
index 92efa951524..04ab90f83f8 100644
--- a/config/initializers/new_framework_defaults_8_0.rb
+++ b/config/initializers/new_framework_defaults_8_0.rb
@@ -15,16 +15,16 @@
 # If set to `:offset`, `to_time` methods will use the UTC offset.
 # If `false`, `to_time` methods will convert to the local system UTC offset instead.
 #++
-# Rails.application.config.active_support.to_time_preserves_timezone = :zone
+Rails.application.config.active_support.to_time_preserves_timezone = :zone
 
 ###
 # When both `If-Modified-Since` and `If-None-Match` are provided by the client
 # only consider `If-None-Match` as specified by RFC 7232 Section 6.
 # If set to `false` both conditions need to be satisfied.
 #++
-# Rails.application.config.action_dispatch.strict_freshness = true
+Rails.application.config.action_dispatch.strict_freshness = true
 
 ###
 # Set `Regexp.timeout` to `1`s by default to improve security over Regexp Denial-of-Service attacks.
 #++
-# Regexp.timeout = 1
+Regexp.timeout = 1

From 0f97a027df0aa11d2b13fc7266e9fb6f3b2cbc31 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Wed, 17 Dec 2025 22:16:31 -0800
Subject: [PATCH 05/10] AO3-7231 Set 8.0 defaults

---
 config/application.rb                         |  2 +-
 .../new_framework_defaults_8_0.rb             | 30 -------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 config/initializers/new_framework_defaults_8_0.rb

diff --git a/config/application.rb b/config/application.rb
index dfb3530c97e..62d50289465 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,7 +22,7 @@ class Application < Rails::Application
     # These settings can be overridden in specific environments using the files
     # in config/environments, which are processed later.
 
-    config.load_defaults 7.2
+    config.load_defaults 8.0
 
     %w[
       app/models/challenge_models
diff --git a/config/initializers/new_framework_defaults_8_0.rb b/config/initializers/new_framework_defaults_8_0.rb
deleted file mode 100644
index 04ab90f83f8..00000000000
--- a/config/initializers/new_framework_defaults_8_0.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file eases your Rails 8.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 `8.0`.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
-
-###
-# Specifies whether `to_time` methods preserve the UTC offset of their receivers or preserves the timezone.
-# If set to `:zone`, `to_time` methods will use the timezone of their receivers.
-# If set to `:offset`, `to_time` methods will use the UTC offset.
-# If `false`, `to_time` methods will convert to the local system UTC offset instead.
-#++
-Rails.application.config.active_support.to_time_preserves_timezone = :zone
-
-###
-# When both `If-Modified-Since` and `If-None-Match` are provided by the client
-# only consider `If-None-Match` as specified by RFC 7232 Section 6.
-# If set to `false` both conditions need to be satisfied.
-#++
-Rails.application.config.action_dispatch.strict_freshness = true
-
-###
-# Set `Regexp.timeout` to `1`s by default to improve security over Regexp Denial-of-Service attacks.
-#++
-Regexp.timeout = 1

From 691cfe858b0047fd94361edfbb4b5dc0d8e15e50 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Wed, 17 Dec 2025 22:52:54 -0800
Subject: [PATCH 06/10] AO3-7231 Try deleting enqueue_after_transaction_commit?

---
 config/application.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 62d50289465..4fa20ff258e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -105,9 +105,6 @@ class Application < Rails::Application
     # Use Resque to run ActiveJobs (including sending delayed mail):
     config.active_job.queue_adapter = :resque
 
-    # todo(8.0): Remove with Rails 8.0 where this option will be deprecated
-    config.active_job.enqueue_after_transaction_commit = :always
-
     config.active_model.i18n_customize_full_message = true
 
     config.action_mailer.default_url_options = { host: ArchiveConfig.APP_HOST, protocol: "https" }

From 579fc0e6ee393a858871534d59dcbe489a5e6e1b Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Thu, 18 Dec 2025 00:00:39 -0800
Subject: [PATCH 07/10] AO3-7231 Set enqueue_after_transaction_commit on jobs

better safe than sorry?
---
 app/jobs/application_job.rb        | 2 ++
 app/jobs/application_mailer_job.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index 2cbf4e30acb..a914814dff7 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,4 +1,6 @@
 class ApplicationJob < ActiveJob::Base
+  self.enqueue_after_transaction_commit = true
+
   include AfterCommitEverywhere
   extend AfterCommitEverywhere
 
diff --git a/app/jobs/application_mailer_job.rb b/app/jobs/application_mailer_job.rb
index 3e768194d10..f67aa6f5d99 100644
--- a/app/jobs/application_mailer_job.rb
+++ b/app/jobs/application_mailer_job.rb
@@ -1,4 +1,6 @@
 class ApplicationMailerJob < ActionMailer::MailDeliveryJob
+  self.enqueue_after_transaction_commit = true
+  
   # TODO: We have a mix of mailers that take ActiveRecords as arguments, and
   # mailers that take IDs as arguments. If an item is unavailable when the
   # notification is sent, it'll produce an ActiveJob::DeserializationError in

From 8bf5c179c6da69d06d40762c1f55e6c26946fc79 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Thu, 18 Dec 2025 22:54:31 -0800
Subject: [PATCH 08/10] AO3-7231 Rubocop

---
 config/routes.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index fd5b2804e2a..08b09f134c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,12 +48,12 @@
 
   #### ERRORS ####
 
-  get '/400', to: 'errors#400'
-  get '/403', to: 'errors#403'
-  get '/404', to: 'errors#404'
-  get '/422', to: 'errors#422'
-  get '/500', to: 'errors#500'
-  get '/auth_error', to: 'errors#auth_error'
+  get "/400", to: "errors#400"
+  get "/403", to: "errors#403"
+  get "/404", to: "errors#404"
+  get "/422", to: "errors#422"
+  get "/500", to: "errors#500"
+  get "/auth_error", to: "errors#auth_error"
   get "/timeout_error", to: "errors#timeout_error"
 
   #### DOWNLOADS ####

From 3c079f5c5fdde05d4e0acc95aceae82790db1e0a Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Fri, 9 Jan 2026 18:33:06 -0800
Subject: [PATCH 09/10] AO3-7231 Pull from main rails-i18n repository

---
 Gemfile      |  2 +-
 Gemfile.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 40e66a7dbc2..ef467f7f6db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'test-unit', '~> 3.2'
 gem 'bundler'
 
 gem "rails", "~> 8.0.0"
-gem "rails-i18n", "~> 8.0", git: "https://github.com/marcus8448/rails-i18n", ref: "1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4"
+gem "rails-i18n", "~> 8.0", git: "https://github.com/svenfuchs/rails-i18n", ref: "54c1c7c2fdcc311427ec6f1dadd298a60db1ddef"
 gem "rack", "~> 2.2"
 gem "sprockets", "< 4"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a135edb7a48..abbdfa72796 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/marcus8448/rails-i18n
-  revision: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
-  ref: 1d120cc3b2c02793e7cab4ff5951d3a9e0b316a4
-  specs:
-    rails-i18n (8.1.0)
-      i18n (>= 0.7, < 2)
-      railties (>= 8.0.0, < 9)
-
 GIT
   remote: https://github.com/rails/rails-observers
   revision: 389b577322d8b17336730b2dc4e179060a23c8e7
@@ -14,6 +5,15 @@ GIT
     rails-observers (0.2.0)
       activemodel (>= 4.2)
 
+GIT
+  remote: https://github.com/svenfuchs/rails-i18n
+  revision: 54c1c7c2fdcc311427ec6f1dadd298a60db1ddef
+  ref: 54c1c7c2fdcc311427ec6f1dadd298a60db1ddef
+  specs:
+    rails-i18n (8.1.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 8.0.0, < 9)
+
 GIT
   remote: https://github.com/winston/google_visualr
   revision: 17b97114a345baadd011e7b442b9a6c91a2b7ab5

From c3f8b1c8f7bca8207912cf8c39489a40ba5d3511 Mon Sep 17 00:00:00 2001
From: Marcus Low <mlow16@outlook.com>
Date: Fri, 9 Jan 2026 18:38:19 -0800
Subject: [PATCH 10/10] AO3-7231 Always enable enqueue_after_transaction_commit

The setting will be undeprecated and enabled by default in Rails 8.2

https://redirect.github.com/rails/rails/commit/a477a3273c3c71305cc8ae1835638dc75184ad9d
---
 app/jobs/application_job.rb                            | 2 --
 app/jobs/application_mailer_job.rb                     | 2 --
 config/initializers/active_job_enqueue_after_commit.rb | 7 +++++++
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 config/initializers/active_job_enqueue_after_commit.rb

diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index a914814dff7..2cbf4e30acb 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,6 +1,4 @@
 class ApplicationJob < ActiveJob::Base
-  self.enqueue_after_transaction_commit = true
-
   include AfterCommitEverywhere
   extend AfterCommitEverywhere
 
diff --git a/app/jobs/application_mailer_job.rb b/app/jobs/application_mailer_job.rb
index f67aa6f5d99..3e768194d10 100644
--- a/app/jobs/application_mailer_job.rb
+++ b/app/jobs/application_mailer_job.rb
@@ -1,6 +1,4 @@
 class ApplicationMailerJob < ActionMailer::MailDeliveryJob
-  self.enqueue_after_transaction_commit = true
-  
   # TODO: We have a mix of mailers that take ActiveRecords as arguments, and
   # mailers that take IDs as arguments. If an item is unavailable when the
   # notification is sent, it'll produce an ActiveJob::DeserializationError in
diff --git a/config/initializers/active_job_enqueue_after_commit.rb b/config/initializers/active_job_enqueue_after_commit.rb
new file mode 100644
index 00000000000..5c2ffa36c09
--- /dev/null
+++ b/config/initializers/active_job_enqueue_after_commit.rb
@@ -0,0 +1,7 @@
+# always enable enqueue_after_transaction_commit
+# TODO: remove for rails 8.2! https://github.com/rails/rails/commit/a477a3273c3c71305cc8ae1835638dc75184ad9d
+Rails.application.config.after_initialize do
+  ActiveSupport.on_load(:active_job) do
+    ActiveJob::Base.enqueue_after_transaction_commit = true
+  end
+end