Merge branch 'develop' into gun

2020-03-16 14:25:55 +03:00 · 2020-03-16 14:25:55 +03:00 · f0651730bd
commit f0651730bd
parent 98ed0d1c4b c2527b8c63
108 changed files with 1237 additions and 881 deletions
--- a/test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller_test.exs
@ -756,10 +756,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
  end

  describe "create account by app / rate limit" do
-    clear_config([Pleroma.Plugs.RemoteIp, :enabled]) do
-      Pleroma.Config.put([Pleroma.Plugs.RemoteIp, :enabled], true)
-    end
-
    clear_config([:rate_limit, :app_account_creation]) do
      Pleroma.Config.put([:rate_limit, :app_account_creation], {10_000, 2})
    end