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

2025-01-28 18:02:01 +09:00 · 2025-01-28 18:02:01 +09:00 · 3e065f4e12
commit 3e065f4e12
parent bfa1700909 6646a0a9fa
200 changed files with 2190 additions and 738 deletions
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@ -172,7 +172,8 @@ module Admin
    end

    def form_account_batch_params
-      params.require(:form_account_batch).permit(:action, account_ids: [])
+      params
+        .expect(form_account_batch: [:action, account_ids: []])
    end

    def action_from_button