Merge branch 'develop' into issue/1383

2020-02-03 21:42:36 +03:00 · 2020-02-03 21:42:36 +03:00 · 2c40c8b4a2
commit 2c40c8b4a2
parent 21a2a05407 c27d1d65bf
49 changed files with 773 additions and 97 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 =