Commit 68a667a4 authored by lain's avatar lain

Merge branch 'test-timeout' into 'develop'

Fix intermittent failures in federated testing

See merge request pleroma/pleroma!2058
parents 8cb85252 63ffa0e3
Pipeline #21041 passed with stages
in 45 minutes and 21 seconds
......@@ -68,7 +68,9 @@
queues: false,
prune: :disabled
config :pleroma, Pleroma.Scheduler, jobs: []
config :pleroma, Pleroma.Scheduler,
jobs: [],
global: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment