Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

config/initializers/paperclip.rb

@@ -90,13 +90,19 @@ if ENV['S3_ENABLED'] == 'true'
 
   # Some S3-compatible providers might not actually be compatible with some APIs
   # used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822
-  if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
+  # and https://github.com/mastodon/mastodon/issues/26394
+  if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true' || ENV['S3_DISABLE_CHECKSUM_MODE'] == 'true'
     module Paperclip
       module Storage
         module S3Extensions
           def copy_to_local_file(style, local_dest_path)
             log("copying #{path(style)} to local file #{local_dest_path}")
-            s3_object(style).download_file(local_dest_path, { mode: 'single_request' })
+
+            options = {}
+            options[:mode] = 'single_request' if ENV['S3_FORCE_SINGLE_REQUEST'] == 'true'
+            options[:checksum_mode] = 'DISABLED' if ENV['S3_DISABLE_CHECKSUM_MODE'] == 'true'
+
+            s3_object(style).download_file(local_dest_path, options)
           rescue Aws::Errors::ServiceError => e
             warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
             false

config/initializers/statsd.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+if ENV['STATSD_ADDR'].present?
+  host, port = ENV['STATSD_ADDR'].split(':')
+
+  statsd = Statsd.new(host, port)
+  statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
+
+  NSA.inform_statsd(statsd) do |informant|
+    informant.collect(:action_controller, :web)
+    informant.collect(:active_record, :db)
+    informant.collect(:active_support_cache, :cache)
+    informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
+  end
+end