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

Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064
2020-01-30 19:24:04 +00:00 · 2020-01-30 19:24:04 +00:00 · c27d1d65bf
commit c27d1d65bf
parent 774cba84f5 5b62acf6e9
4 changed files with 67 additions and 7 deletions
--- a/test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller_test.exs
@ -668,6 +668,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
    end

    test "rate limit", %{conn: conn} do
+      Pleroma.Config.put([Pleroma.Plugs.RemoteIp, :enabled], true)
      app_token = insert(:oauth_token, user: nil)

      conn =