summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-12-19 12:16:33 -0600
committerMark Felder <feld@FreeBSD.org>2019-12-19 12:16:33 -0600
commit50638525db6bf7d59c4a5820848c9f6773cc49e1 (patch)
tree6d94f34ddd482d57178107076a7e2f44698a3e43 /config/test.exs
parentdf469b4468168cf072e73df73e0fdde2bbab1da5 (diff)
parent38ad407395e838ddf1c11922806adc080af44d36 (diff)
downloadpleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.tar.gz
pleroma-50638525db6bf7d59c4a5820848c9f6773cc49e1.zip
Merge branch 'develop' into config/benchmark
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 9b737d4d7..d52ced612 100644
--- 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,