summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-02-13 09:20:34 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-02-13 09:20:34 +0300
commitda44ee5b0f6207666442b956ab2cdef3e5e9b49b (patch)
treeecdc227a5f37eef0b11445c6a7d5d3bd4c386737 /config
parent58574ef15627dbae8f12ba59fd043c70d287f794 (diff)
parentd056f7f722b5e734ac53d8b55a0228174d64cc9f (diff)
downloadpleroma-da44ee5b0f6207666442b956ab2cdef3e5e9b49b.tar.gz
pleroma-da44ee5b0f6207666442b956ab2cdef3e5e9b49b.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'config')
-rw-r--r--config/test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index ce4586c7b..078c46205 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -66,7 +66,8 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :pleroma, Oban,
queues: false,
- prune: :disabled
+ prune: :disabled,
+ crontab: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,