diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-18 17:46:09 +0300 |
| commit | 61d9f43e463a3b3b0c1e4b9c98c22e222797bd82 (patch) | |
| tree | d0db351126377c4a648155df4dfdfd4358874b9c /config/test.exs | |
| parent | 269d592181bff8601f6545b85158ee1c222ff20d (diff) | |
| parent | 3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0 (diff) | |
| download | pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.tar.gz pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config/test.exs b/config/test.exs index 5c66a36f1..078c46205 100644 --- a/config/test.exs +++ b/config/test.exs @@ -66,11 +66,8 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma, Oban, queues: false, - prune: :disabled - -config :pleroma, Pleroma.Scheduler, - jobs: [], - global: false + prune: :disabled, + crontab: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, |