diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-29 21:52:33 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-29 21:52:33 +0000 |
| commit | 19e559fe5130f66a967732a40ccea1ac39e85eb8 (patch) | |
| tree | 51ad0c1db434c1202724add76b1442342abc74e9 /config/test.exs | |
| parent | 269aa9c8a5acc72c76105c78c2c60e18cf71a70b (diff) | |
| parent | c747260989fdba32a8f319f88f0840c811ff8b50 (diff) | |
| download | pleroma-19e559fe5130f66a967732a40ccea1ac39e85eb8.tar.gz pleroma-19e559fe5130f66a967732a40ccea1ac39e85eb8.zip | |
Merge branch 'rate-limiter-runtime-settings' into 'develop'
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config/test.exs b/config/test.exs index 6bea09380..a17886265 100644 --- a/config/test.exs +++ b/config/test.exs @@ -74,11 +74,7 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false -config :pleroma, :rate_limit, - search: [{1000, 30}, {1000, 30}], - app_account_creation: {10_000, 5}, - password_reset: {1000, 30}, - ap_routes: nil +config :pleroma, :rate_limit, %{} config :pleroma, :http_security, report_uri: "https://endpoint.com" |