pleroma

commit: 68a667a465f0c51ba9842742ef010da7b69d7a69
parent: 8cb852523a13530ae77b76e4d3253ccd5883e9dc
Author: lain <lain@soykaf.club>
Date:   Thu, 12 Dec 2019 09:31:50 +0000

Merge branch 'test-timeout' into 'develop'

Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
Diffstat:
M
config/test.exs
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/config/test.exs b/config/test.exs
@@ -68,7 +68,9 @@ config :pleroma, Oban,
   queues: false,
   prune: :disabled
 
-config :pleroma, Pleroma.Scheduler, jobs: []
+config :pleroma, Pleroma.Scheduler,
+  jobs: [],
+  global: false
 
 config :pleroma, Pleroma.ScheduledActivity,
   daily_user_limit: 2,