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

2023-11-14 09:14:19 +09:00 · 2023-11-14 09:14:19 +09:00 · 0704829a9b
commit 0704829a9b
parent f06f9565ca b7807f3d84
80 changed files with 1483 additions and 1117 deletions
--- a/lib/tasks/tests.rake
+++ b/lib/tasks/tests.rake
@ -69,7 +69,7 @@ namespace :tests do
        exit(1)
      end

-      unless Status.find(12).preview_cards.pluck(:url) == ['https://joinmastodon.org/']
+      unless PreviewCard.where(id: PreviewCardsStatus.where(status_id: 12).select(:preview_card_id)).pluck(:url) == ['https://joinmastodon.org/']
        puts 'Preview cards not deduplicated as expected'
        exit(1)
      end