diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-19 19:10:55 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-19 19:10:55 +0300 |
| commit | c0ecbf6669948740a091bdf5b5441fb6ee55f4fc (patch) | |
| tree | 9ad9fadc6855b1529df7ce8403683c32f776265b /config/test.exs | |
| parent | d3fe2c8ec6116fbc3058f7a795ef59564bddfb08 (diff) | |
| parent | 1dd718e83c76db218f12a98344b568fe10ecbefe (diff) | |
| download | pleroma-c0ecbf6669948740a091bdf5b5441fb6ee55f4fc.tar.gz pleroma-c0ecbf6669948740a091bdf5b5441fb6ee55f4fc.zip | |
[#468] Merged `upstream/develop`.
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 412970d93..fbeba0919 100644 --- a/config/test.exs +++ b/config/test.exs @@ -44,6 +44,8 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" +config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] + try do import_config "test.secret.exs" rescue |