diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-22 21:01:28 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-22 21:01:28 +0300 |
| commit | 7101ba1a21ded292ba057f9aadec1756914b45e0 (patch) | |
| tree | 6ee1e10eba5b579d7e469ac8a340bb496f564411 /config | |
| parent | 256ff09aa8068166a9f83e3159f060fd4598af76 (diff) | |
| parent | 0e50e9e4fa5a5d33d36f4226e1d32a00bf53fc72 (diff) | |
| download | pleroma-7101ba1a21ded292ba057f9aadec1756914b45e0.tar.gz pleroma-7101ba1a21ded292ba057f9aadec1756914b45e0.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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 b347df7e8..9794997d9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -573,7 +573,8 @@ config :pleroma, :rate_limit, statuses_actions: {10_000, 15}, status_id_action: {60_000, 3}, password_reset: {1_800_000, 5}, - account_confirmation_resend: {8_640_000, 5} + account_confirmation_resend: {8_640_000, 5}, + ap_routes: {60_000, 15} # 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 f897b5d48..a0fa67516 100644 --- a/config/test.exs +++ b/config/test.exs @@ -75,7 +75,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :rate_limit, search: [{1000, 30}, {1000, 30}], app_account_creation: {10_000, 5}, - password_reset: {1000, 30} + password_reset: {1000, 30}, + ap_routes: nil config :pleroma, :http_security, report_uri: "https://endpoint.com" |