diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-02-11 10:33:41 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-02-11 10:33:41 -0600 |
| commit | f9eb35d48e9f129df240c2c2134b4664121cecfe (patch) | |
| tree | 2aca1a10c2df0852bd56e6eecf8446265eaac57d /config/test.exs | |
| parent | de0fea463486537766403baa6663a618c93aa941 (diff) | |
| parent | 3fee859b60d2b97e8210faf872a03d99cfc574cc (diff) | |
| download | pleroma-f9eb35d48e9f129df240c2c2134b4664121cecfe.tar.gz pleroma-f9eb35d48e9f129df240c2c2134b4664121cecfe.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
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, |