diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-15 14:22:10 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-03-15 14:22:10 +0000 |
| commit | 67a27825b19aabb7c0521d534cbacbec78e43231 (patch) | |
| tree | 5aeaa171ea2a586693fa4ece9dfd364d56bc9535 /config | |
| parent | 85ac9091604cc33948d7657657d354660bc4bb1b (diff) | |
| parent | fc4496d4fa45b0389f8476b2c2ee00d647a1dfbe (diff) | |
| download | pleroma-67a27825b19aabb7c0521d534cbacbec78e43231.tar.gz pleroma-67a27825b19aabb7c0521d534cbacbec78e43231.zip | |
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index a17886265..b8ea63c94 100644 --- a/config/test.exs +++ b/config/test.exs @@ -92,6 +92,8 @@ config :pleroma, :modules, runtime_dir: "test/fixtures/modules" config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true +config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |