From c3eadc8d252aa23e265e6d836b52df2ef73f115c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Mon, 24 Aug 2026 07:28:53 +0000
Subject: [PATCH] Prefer autoload to require in misc `app/` files (#40243)

---
 app/controllers/admin/export_domain_allows_controller.rb | 2 --
 app/controllers/admin/export_domain_blocks_controller.rb | 2 --
 app/controllers/settings/imports_controller.rb           | 2 --
 app/lib/activitypub/tag_manager.rb                       | 2 --
 app/lib/entity_cache.rb                                  | 2 --
 app/lib/feed_manager.rb                                  | 2 --
 app/lib/inline_script_manager.rb                         | 2 --
 app/lib/tag_manager.rb                                   | 2 --
 app/lib/themes.rb                                        | 3 ---
 app/models/admin/import.rb                               | 2 --
 app/models/export.rb                                     | 2 --
 app/models/form/import.rb                                | 2 --
 spec/lib/request_spec.rb                                 | 1 -
 13 files changed, 26 deletions(-)

diff --git a/app/controllers/admin/export_domain_allows_controller.rb b/app/controllers/admin/export_domain_allows_controller.rb
index d1a2ea5bbf2..5d7e92a1260 100644
--- a/app/controllers/admin/export_domain_allows_controller.rb
+++ b/app/controllers/admin/export_domain_allows_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 module Admin
   class ExportDomainAllowsController < BaseController
     include Admin::ExportControllerConcern
diff --git a/app/controllers/admin/export_domain_blocks_controller.rb b/app/controllers/admin/export_domain_blocks_controller.rb
index 9caafd9684f..695f8533f5e 100644
--- a/app/controllers/admin/export_domain_blocks_controller.rb
+++ b/app/controllers/admin/export_domain_blocks_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 module Admin
   class ExportDomainBlocksController < BaseController
     include Admin::ExportControllerConcern
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index a8dc31b7c74..6004012561d 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 class Settings::ImportsController < Settings::BaseController
   before_action :set_bulk_import, only: [:show, :confirm, :destroy]
   before_action :set_recent_imports, only: [:index]
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 8f062263adf..cc91bb08f70 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 class ActivityPub::TagManager
   include Singleton
   include JsonLdHelper
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index b0c113afd32..43e86237621 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 class EntityCache
   include Singleton
 
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 8dcca154b99..9843c6228ab 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 class FeedManager
   include Singleton
   include Redisable
diff --git a/app/lib/inline_script_manager.rb b/app/lib/inline_script_manager.rb
index bca7c98f6b7..2e21140f7af 100644
--- a/app/lib/inline_script_manager.rb
+++ b/app/lib/inline_script_manager.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 class InlineScriptManager
   include Singleton
   include ActionView::Helpers::TagHelper
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
index 4b2f96da634..41c01f6937f 100644
--- a/app/lib/tag_manager.rb
+++ b/app/lib/tag_manager.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-
 class TagManager
   include Singleton
   include RoutingHelper
diff --git a/app/lib/themes.rb b/app/lib/themes.rb
index 67b1275d447..47360b4ddbd 100644
--- a/app/lib/themes.rb
+++ b/app/lib/themes.rb
@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'singleton'
-require 'yaml'
-
 class Themes
   include Singleton
 
diff --git a/app/models/admin/import.rb b/app/models/admin/import.rb
index c12c9a86b91..66b6f79dcea 100644
--- a/app/models/admin/import.rb
+++ b/app/models/admin/import.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 # A non-activerecord helper class for csv upload
 class Admin::Import
   include ActiveModel::Model
diff --git a/app/models/export.rb b/app/models/export.rb
index 2b92dc62008..597e6fdb354 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 class Export
   attr_reader :account
 
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index e3ad5f8f1e2..eded16a1d7a 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 # A non-ActiveRecord helper class for CSV uploads.
 # Handles saving contents to database.
 class Form::Import
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 80ea9efb98a..4a237eac005 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'securerandom'
 
 RSpec.describe Request do
   subject { described_class.new(:get, 'http://example.com', **options) }