diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-16 21:44:50 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-16 21:44:50 +0000 |
| commit | 0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd (patch) | |
| tree | 1740bc35a064b2eb6a7e8beed0796d1ab7192a89 /config | |
| parent | 33fbb638cd815037741be25d0e47c3d16cc96971 (diff) | |
| parent | 10f82c88b88fa4d26f6fa57f9cf36439012b8d0c (diff) | |
| download | pleroma-0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd.tar.gz pleroma-0bbc0f0cf4ee87e8ac5995818c8049bf86e848cd.zip | |
Merge branch 'feature/1078-password-reset' into 'develop'
Feature/1078 password reset
Closes #1078
See merge request pleroma/pleroma!1431
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 03e0341c8..38780eef7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -531,7 +531,8 @@ config :pleroma, :rate_limit, relations_actions: {10_000, 10}, relation_id_action: {60_000, 2}, statuses_actions: {10_000, 15}, - status_id_action: {60_000, 3} + status_id_action: {60_000, 3}, + password_reset: {1_800_000, 5} # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. diff --git a/config/test.exs b/config/test.exs index 96ecf3592..0af62aa14 100644 --- a/config/test.exs +++ b/config/test.exs @@ -67,7 +67,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :rate_limit, search: [{1000, 30}, {1000, 30}], - app_account_creation: {10_000, 5} + app_account_creation: {10_000, 5}, + password_reset: {1000, 30} config :pleroma, :http_security, report_uri: "https://endpoint.com" |