summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-17 09:24:08 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-17 09:24:08 +0300
commita879c396bb3a07929d4821ef2c29610808962c6d (patch)
treec0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6 /config/test.exs
parent22fc271e23a5dd1570ea7429b563f6edc42613c4 (diff)
parent804b961d3c8e0034c7b6057a164126e5d01a084b (diff)
downloadpleroma-a879c396bb3a07929d4821ef2c29610808962c6d.tar.gz
pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.zip
Merge branch 'develop' into feature/tag_feed
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,