diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-01-30 19:24:04 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-01-30 19:24:04 +0000 |
| commit | c27d1d65bfd60effdb45359697141c136e156177 (patch) | |
| tree | 7e5df990c3100024b52f00a0eda89ad74ad0a9cb /test/web/mastodon_api/controllers/account_controller_test.exs | |
| parent | 774cba84f50b7ebc4eef3406467aafa5fa76dff7 (diff) | |
| parent | 5b62acf6e9a38f8d14a9fb37cc85e646fb0169e3 (diff) | |
| download | pleroma-c27d1d65bfd60effdb45359697141c136e156177.tar.gz pleroma-c27d1d65bfd60effdb45359697141c136e156177.zip | |
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
Diffstat (limited to 'test/web/mastodon_api/controllers/account_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/account_controller_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs index 0d4860a42..ec1e18002 100644 --- 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 = |