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/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@ -109,7 +109,7 @@ RSpec.describe ReblogService do
          Status
            .where(id: reblog_of_id)
            .where(text: 'discard-status-text')
-            .update_all(deleted_at: Time.now.utc)
+            .touch_all(:deleted_at)
        end
      end
    end