diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
| commit | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (patch) | |
| tree | 51fa0436998541c3bcc1885eaa2188d7dbb7d469 /config/test.exs | |
| parent | c3ecaea64dd377b586e3b2a5316e90884ec78fe6 (diff) | |
| parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
| download | pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.tar.gz pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.zip | |
Resolve merge conflicts
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 28eea3b00..aded8600d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -32,6 +32,8 @@ config :pleroma, :instance, federating: false, external_user_synchronization: false +config :pleroma, :activitypub, sign_object_fetches: false + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, @@ -68,7 +70,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" |