Merge remote-tracking branch 'parent/main' into upstream-20241113

lib/tasks/mastodon.rake

@@ -596,7 +596,7 @@ def disable_log_stdout!
 
   Rails.logger                 = dev_null
   ActiveRecord::Base.logger    = dev_null
-  HttpLog.configuration.logger = dev_null
+  HttpLog.configuration.logger = dev_null if defined?(HttpLog)
   Paperclip.options[:log]      = false
 end
 

lib/tasks/repo.rake

@@ -18,7 +18,7 @@ namespace :repo do
 
     url = "https://api.github.com/repos/#{REPOSITORY_NAME}/contributors?anon=1"
 
-    HttpLog.config.compact_log = true
+    HttpLog.config.compact_log = true if defined?(HttpLog)
 
     while url.present?
       response     = HTTP.get(url)
@@ -43,7 +43,7 @@ namespace :repo do
     path = Rails.root.join('CHANGELOG.md')
     tmp  = Tempfile.new
 
-    HttpLog.config.compact_log = true
+    HttpLog.config.compact_log = true if defined?(HttpLog)
 
     begin
       File.open(path, 'r') do |file|

lib/tasks/tests.rake

@@ -11,7 +11,7 @@ namespace :tests do
         '3_3_0' => 2020_12_18_054746,
       }.each do |release, version|
         ActiveRecord::Tasks::DatabaseTasks
-          .migration_connection
+          .migration_connection_pool
           .migration_context
           .migrate(version)
         Rake::Task["tests:migrations:populate_v#{release}"]