about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-04-28 19:24:18 +0200
committerGitHub <noreply@github.com>2022-04-28 19:24:18 +0200
commit78f7f23ad21359893cb022b7c2f7644d5c22cb43 (patch)
tree77b919683a8656a361d7d62c8745233bc8b2d310 /app/controllers/settings
parent6a9d1549484a6fb02d7d01e884577a7185302046 (diff)
parentf23f784f1811a5e7ae82faaf8868e389e9608f5d (diff)
Merge pull request #1756 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/exports_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb
index 30138d29e..1638d3412 100644
--- 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