Merge commit '9e04007020' into upstream-20240725

2024-07-25 13:06:26 +09:00 · 2024-07-25 13:06:26 +09:00 · a99f174d98
commit a99f174d98
parent b54bc52ba5 9e04007020
322 changed files with 8093 additions and 1586 deletions
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@ -13,6 +13,7 @@ module Admin
    def show
      authorize :instance, :show?
      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @action_logs = Admin::ActionLogFilter.new(target_domain: @instance.domain).results.limit(5)
    end

    def destroy