Merge branch 'main' into glitch-soc/merge-upstream

2022-04-28 18:16:42 +02:00
parent 6a9d154948 8284110c55
commit f23f784f18
87 changed files with 911 additions and 678 deletions
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@ -2,6 +2,8 @@

 module Admin
  class DashboardController < BaseController
+    include Redisable
+
    def index
      @system_checks         = Admin::SystemCheck.perform
      @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
@ -15,10 +17,10 @@ module Admin

    def redis_info
      @redis_info ||= begin
-        if Redis.current.is_a?(Redis::Namespace)
-          Redis.current.redis.info
+        if redis.is_a?(Redis::Namespace)
+          redis.redis.info
        else
-          Redis.current.info
+          redis.info
        end
      end
    end