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

2024-12-06 12:17:45 +09:00 · 2024-12-06 12:17:45 +09:00 · 3c3ee557d0
commit 3c3ee557d0
parent 58ce8274e5 d29eddc401
187 changed files with 1105 additions and 537 deletions
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@ -91,6 +91,7 @@ RSpec.describe AdminMailer do
    before do
      PreviewCardTrend.create!(preview_card: link)
      StatusTrend.create!(status: status, account: Fabricate(:account))
+      TagTrend.create!(tag: tag)
      recipient.user.update(locale: :en)
    end