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/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@ -164,7 +164,7 @@ class ActivityPub::Activity
  end

  def lock_or_fail(key, expire_after = 15.minutes.seconds)
-    RedisLock.acquire({ redis: Redis.current, key: key, autorelease: expire_after }) do |lock|
+    RedisLock.acquire({ redis: redis, key: key, autorelease: expire_after }) do |lock|
      if lock.acquired?
        yield
      else