summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-11-26 15:35:22 +0000
committerrinpatch <rinpatch@sdf.org>2020-11-26 15:35:22 +0000
commitbb522bcc44463d258672f35979a2c939e7199e55 (patch)
treeed0ba622a9167484011b3e335d4c688d4d13a23d /config/test.exs
parent2b4e3555222792a54755e8c6be7d2e8d44b1c99d (diff)
parent94480c66078d664accc1dc3c2cdb029c327b545c (diff)
downloadpleroma-bb522bcc44463d258672f35979a2c939e7199e55.tar.gz
pleroma-bb522bcc44463d258672f35979a2c939e7199e55.zip
Merge branch 'removing-fed-sockets-settings' into 'develop'
Removing remaining fed sockets settings See merge request pleroma/pleroma!3177
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs5
1 files changed, 0 insertions, 5 deletions
diff --git a/config/test.exs b/config/test.exs
index 7cc660e3c..2a20a03e7 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -19,11 +19,6 @@ 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,