diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:46:59 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:46:59 +0700 |
| commit | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (patch) | |
| tree | 09ec548304cf3bbabba5a3b216c2d6769c9a6525 /config/test.exs | |
| parent | a1a854646e96598473ed7a323e034cf1f88ca508 (diff) | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| download | pleroma-c3d5c3513a3205313f0a2e28bb328ad5b48f2055.tar.gz pleroma-c3d5c3513a3205313f0a2e28bb328ad5b48f2055.zip | |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 6a7b9067e..894fa8d3d 100644 --- a/config/test.exs +++ b/config/test.exs @@ -50,6 +50,11 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma_job_queue, disabled: true +config :pleroma, Pleroma.ScheduledActivity, + daily_user_limit: 2, + total_user_limit: 3, + enabled: false + try do import_config "test.secret.exs" rescue |