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

2024-11-19 08:49:55 +09:00 · 2024-11-19 08:49:55 +09:00 · 055045981f
commit 055045981f
parent 54ea89de9f 295ad6f19a
221 changed files with 2006 additions and 1127 deletions
--- a/app/lib/importer/statuses_index_importer.rb
+++ b/app/lib/importer/statuses_index_importer.rb
@ -80,7 +80,7 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
  end

  def local_votes_scope
-    Poll.joins(:votes).where(votes: { account: Account.local }).select('polls.id, polls.status_id')
+    Poll.joins(:votes).where(votes: { account: Account.local }).select(polls: [:id, :status_id])
  end

  def local_statuses_scope