diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-25 12:24:12 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-25 12:24:12 +0300 |
commit | 1a858134edabfe9a85e07fb801b9ed41649ba08a (patch) | |
tree | 9acff5da3ff7a09f5b6f1e33ee9ac225471b4da6 /config/test.exs | |
parent | 8c6cdff3cc48101711d0f09852866311780d97db (diff) | |
parent | 29dd8ab9c0ef28f9649fe0a5b29a0bbcfb4c0965 (diff) | |
download | pleroma-1a858134edabfe9a85e07fb801b9ed41649ba08a.tar.gz pleroma-1a858134edabfe9a85e07fb801b9ed41649ba08a.zip |
Merge branch 'develop' into issue/1218
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index 567780987..da2778aa7 100644 --- a/config/test.exs +++ b/config/test.exs @@ -30,7 +30,8 @@ config :pleroma, :instance, notify_email: "noreply@example.com", skip_thread_containment: false, federating: false, - external_user_synchronization: false + external_user_synchronization: false, + static_dir: "test/instance_static/" config :pleroma, :activitypub, sign_object_fetches: false @@ -61,7 +62,11 @@ config :web_push_encryption, :vapid_details, config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma_job_queue, disabled: true +config :pleroma, Oban, + queues: false, + prune: :disabled + +config :pleroma, Pleroma.Scheduler, jobs: [] config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, |