diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 09:18:01 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 09:18:01 +0000 |
| commit | b4da2bc1d009ecca0d7821abe3577d1a920c41c0 (patch) | |
| tree | c75ce1ec6e70724c29efe540a2439de635abc160 /config/test.exs | |
| parent | cfa6e7289f5cfdb1fce17eb89bc0513ff624480d (diff) | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| download | pleroma-b4da2bc1d009ecca0d7821abe3577d1a920c41c0.tar.gz pleroma-b4da2bc1d009ecca0d7821abe3577d1a920c41c0.zip | |
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
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 |