diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:41:57 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:41:57 +0300 |
| commit | 179fa32dd5d7b4cf1b338fc3df4840ae33525606 (patch) | |
| tree | d674301d9d20e9da88bedff49d3d8a56646284d8 /config/test.exs | |
| parent | bc3e8c033bbef303890ff6afa92d1fe365e530fb (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-179fa32dd5d7b4cf1b338fc3df4840ae33525606.tar.gz pleroma-179fa32dd5d7b4cf1b338fc3df4840ae33525606.zip | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
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, |