diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-16 15:31:31 +0400 |
| commit | 421e35b578b3fc109f820f693e91139a3e3f8970 (patch) | |
| tree | 37da58962582854597cd068c603b8ba23e10f7bb /test/web/mastodon_api/controllers/account_controller_test.exs | |
| parent | d1c7f8e576e31487544b57d67802843b8ef38388 (diff) | |
| parent | c2527b8c63a4e35b121981efe2c39cc54c77648d (diff) | |
| download | pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.tar.gz pleroma-421e35b578b3fc109f820f693e91139a3e3f8970.zip | |
Merge branch 'develop' into global-status-expiration
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 |