diff options
author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-16 14:25:55 +0300 |
---|---|---|
committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-16 14:25:55 +0300 |
commit | f0651730bdf018b713e21ce718719c7781398362 (patch) | |
tree | 836e0fbcbb49f0ae78635a268e30013c0e94aea7 /test/web/mastodon_api/controllers/account_controller_test.exs | |
parent | 98ed0d1c4bd2db354154cc4a1d1e6530eb68f499 (diff) | |
parent | c2527b8c63a4e35b121981efe2c39cc54c77648d (diff) | |
download | pleroma-f0651730bdf018b713e21ce718719c7781398362.tar.gz pleroma-f0651730bdf018b713e21ce718719c7781398362.zip |
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/mastodon_api/controllers/account_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/controllers/account_controller_test.exs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs index 7f7d8cea3..7efccd9c4 100644 --- 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 |