diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-19 16:55:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-19 16:55:10 -0500 |
| commit | 9169f331b6d481a0aa2b0bfe91500d695fb1b6d6 (patch) | |
| tree | 734ce297aef5a2482c88cdc7d03914943ba4cf28 /config/test.exs | |
| parent | 46c7c53fbbfd9919d429ba15988af0da9e22d444 (diff) | |
| parent | c1c64d6d06fb7307245880d6605d9d9153a4784f (diff) | |
| download | pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.tar.gz pleroma-9169f331b6d481a0aa2b0bfe91500d695fb1b6d6.zip | |
Merge branch 'develop' into feature/matstodon-statuses-by-name
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 96ecf3592..92dca18bc 100644 --- a/config/test.exs +++ b/config/test.exs @@ -31,6 +31,8 @@ config :pleroma, :instance, skip_thread_containment: false, federating: false +config :pleroma, :activitypub, sign_object_fetches: false + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, @@ -67,7 +69,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" |