diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-09-23 11:56:22 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-09-23 11:56:22 -0500 |
commit | f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f (patch) | |
tree | bcfd29188a841470cdeca478b1c5a3bbd4cc930a /config/test.exs | |
parent | 34d7e864db8f9cc7fb73ce2fef8466ce8e09ed85 (diff) | |
parent | e02101e15c425416975f756aca7f3b058006668d (diff) | |
download | pleroma-f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f.tar.gz pleroma-f3a1f9c3bbb7321876a09b3846b5e10ecf4af94f.zip |
Merge branch 'develop' into feature/bulk-confirmation
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 0ee6f1b7f..93a0e2a61 100644 --- a/config/test.exs +++ b/config/test.exs @@ -19,6 +19,11 @@ config :logger, :console, level: :warn, format: "\n[$level] $message\n" +config :pleroma, :fed_sockets, + enabled: false, + connection_duration: 5, + rejection_duration: 5 + config :pleroma, :auth, oauth_consumer_strategies: [] config :pleroma, Pleroma.Upload, |