From: Maxim Filippov <colixer@gmail.com>
Date: Tue, 17 Dec 2019 09:36:56 +0000 (+0300)
Subject: Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=45180d4c6058f790475d8ff28018c912db105082;p=akkoma

Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
---

45180d4c6058f790475d8ff28018c912db105082
diff --cc test/plugs/rate_limiter_test.exs
index f3343abca,78f1ea9e4..06ffa7b70
--- a/test/plugs/rate_limiter_test.exs
+++ b/test/plugs/rate_limiter_test.exs
@@@ -178,10 -145,9 +178,10 @@@ defmodule Pleroma.Plugs.RateLimiterTes
      test "can have limits seperate from unauthenticated connections" do
        limiter_name = :test_authenticated
  
-       scale = 1000
+       scale = 50
        limit = 5
 +      Pleroma.Config.put([Pleroma.Web.Endpoint, :http, :ip], {8, 8, 8, 8})
-       Pleroma.Config.put([:rate_limit, limiter_name], [{1, 10}, {scale, limit}])
+       Pleroma.Config.put([:rate_limit, limiter_name], [{1000, 1}, {scale, limit}])
  
        opts = RateLimiter.init(name: limiter_name)