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/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@ -2,6 +2,7 @@

 class Settings::ExportsController < Settings::BaseController
  include Authorization
+  include Redisable

  skip_before_action :require_functional!

@ -28,6 +29,6 @@ class Settings::ExportsController < Settings::BaseController
  end

  def lock_options
-    { redis: Redis.current, key: "backup:#{current_user.id}" }
+    { redis: redis, key: "backup:#{current_user.id}" }
  end
 end