diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 09:19:10 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 09:19:10 +0300 |
| commit | aac48d0cc6893c231c88d5cd7fe0334353bbf299 (patch) | |
| tree | c3e423993ff5289dd0ba73a94881bd52d9cda1c2 /config/test.exs | |
| parent | f6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff) | |
| parent | f8aa917eef9280631a5cd2c95cf1db8fab6e14e5 (diff) | |
| download | pleroma-aac48d0cc6893c231c88d5cd7fe0334353bbf299.tar.gz pleroma-aac48d0cc6893c231c88d5cd7fe0334353bbf299.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 3691e5bd1..6a7b9067e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -48,7 +48,7 @@ config :web_push_encryption, :vapid_details, config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] +config :pleroma_job_queue, disabled: true try do import_config "test.secret.exs" |