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

2024-03-26 09:08:20 +09:00 · 2024-03-26 09:08:20 +09:00 · 6c9b221cb2
commit 6c9b221cb2
parent 95ab1f729c 0cea7a623b
263 changed files with 4628 additions and 1518 deletions
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@ -142,7 +142,7 @@ module Admin
    def unblock_email
      authorize @account, :unblock_email?

-      CanonicalEmailBlock.where(reference_account: @account).delete_all
+      CanonicalEmailBlock.matching_account(@account).delete_all

      log_action :unblock_email, @account