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/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@ -154,6 +154,6 @@ class RemoveStatusService < BaseService
  end

  def lock_options
-    { redis: Redis.current, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds }
+    { redis: redis, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds }
  end
 end