diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-08 12:20:26 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-08 12:20:26 +0300 |
| commit | bffddf5e31c53d0603de387c61b6011f70785b97 (patch) | |
| tree | 97f07fb95346b603307534a34d0ecee5c9b70af1 /config/test.exs | |
| parent | e3328bc1382315c9067c099995a29db70d9d0433 (diff) | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| download | pleroma-bffddf5e31c53d0603de387c61b6011f70785b97.tar.gz pleroma-bffddf5e31c53d0603de387c61b6011f70785b97.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
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 |