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

diff --cc CHANGELOG.md
Simple merge

diff --cc test/plugs/rate_limiter_test.exs
index f3343abcab90a9874e87bef4c069818668fcdaa1,78f1ea9e46c83079c59667a7cf058cb9846ee0d5..06ffa7b7037476dae35822526982748855714354
--- 1/test/plugs/rate_limiter_test.exs
--- 2/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([:rate_limit, limiter_name], [{1, 10}, {scale, limit}])
 +      Pleroma.Config.put([Pleroma.Web.Endpoint, :http, :ip], {8, 8, 8, 8})
+       Pleroma.Config.put([:rate_limit, limiter_name], [{1000, 1}, {scale, limit}])
  
        opts = RateLimiter.init(name: limiter_name)