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

2024-11-07 08:33:20 +09:00 · 2024-11-07 08:33:20 +09:00 · a003c2db89
commit a003c2db89
parent 943db145e4 d482211aa6
98 changed files with 2002 additions and 590 deletions
--- a/app/models/notification_group.rb
+++ b/app/models/notification_group.rb
@ -67,6 +67,7 @@ class NotificationGroup < ActiveModelSerializers::Model
           :report,
           :account_relationship_severance_event,
           :account_warning,
+           :generated_annual_report,
           to: :notification, prefix: false

  def self.convert_emoji_reaction_pair(activity_ids)