diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-08-02 18:16:04 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-08-02 18:16:04 +0300 |
| commit | 9d4f34fbcb1a8e2eca424b3a3374c9f9af972574 (patch) | |
| tree | c5943eb5d2652e08cc12d0b58a992376c425e66d /config | |
| parent | d2da3d30f3349946500423bab53e0c1221ab7b9b (diff) | |
| parent | 5ff8f07ca906d77a6ec1d5ba912a787f855364f9 (diff) | |
| download | pleroma-9d4f34fbcb1a8e2eca424b3a3374c9f9af972574.tar.gz pleroma-9d4f34fbcb1a8e2eca424b3a3374c9f9af972574.zip | |
Merge branch 'develop' into feature/digest-email
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 fe56bb6f7..d2325edbc 100644 --- a/config/config.exs +++ b/config/config.exs @@ -542,7 +542,8 @@ config :pleroma, :rate_limit, relation_id_action: {60_000, 2}, statuses_actions: {10_000, 15}, status_id_action: {60_000, 3}, - password_reset: {1_800_000, 5} + password_reset: {1_800_000, 5}, + account_confirmation_resend: {8_640_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 dc2d3b80c..6f75f39b5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -29,7 +29,8 @@ config :pleroma, :instance, email: "admin@example.com", notify_email: "noreply@example.com", skip_thread_containment: false, - federating: false + federating: false, + external_user_synchronization: false config :pleroma, :activitypub, sign_object_fetches: false |