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

2024-12-16 10:14:31 +09:00 · 2024-12-16 10:14:31 +09:00 · 3784ad273c
commit 3784ad273c
parent 00a0e21de6 5cf37248cc
555 changed files with 7564 additions and 3363 deletions
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@ -592,7 +592,7 @@ namespace :mastodon do
 end

 def disable_log_stdout!
-  dev_null = Logger.new('/dev/null')
+  dev_null = Logger.new(File::NULL)

  Rails.logger                 = dev_null
  ActiveRecord::Base.logger    = dev_null