diff options
| author | lain <lain@soykaf.club> | 2020-09-22 17:13:46 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-22 17:13:46 +0200 |
| commit | c95859e45b18dec1d00f721ef3c5b4bb1406ea37 (patch) | |
| tree | c22f7a200c0e0e551796bf5e9f1b09afccd64dd4 /config/test.exs | |
| parent | 9853c90abba213bdc87dccf5620cb0d9eb19c049 (diff) | |
| parent | 02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff) | |
| download | pleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.tar.gz pleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
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, |