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

2024-01-22 10:07:33 +09:00 · 2024-01-22 10:07:33 +09:00 · a4cc73438e
commit a4cc73438e
parent 8793bc286e 9f8e3cca9a
65 changed files with 1150 additions and 707 deletions
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@ -6,7 +6,7 @@ module Admin

    def index
      authorize :audit_log, :index?
-      @auditable_accounts = Account.where(id: Admin::ActionLog.select('distinct account_id')).select(:id, :username)
+      @auditable_accounts = Account.auditable.select(:id, :username)
    end

    private