diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-05 07:56:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-05 07:56:36 +0300 |
| commit | e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0 (patch) | |
| tree | d0d2bfc3d847f9bb4fa03f08d9d60f49042b2688 /test/web/mastodon_api/controllers/account_controller_test.exs | |
| parent | 86e4d23acb640efea8cbc879ddbeadfa0e04f9c8 (diff) | |
| parent | a56db789359c7c7d57b45e6c68f791eeadc171e4 (diff) | |
| download | pleroma-e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0.tar.gz pleroma-e84fee5b8624c8909ddd8a7e0d99c6beea4f54d0.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
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 = |