summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
commitbe8350baa2f8c9cf9be3f53ee4a0041dada1386f (patch)
tree8414fc2108941ccadd9b9fd4dd37c9d3cf731399 /config/test.exs
parent589629cf3e1bee9a4f6e92b8456d8614eff73c89 (diff)
parentc8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (diff)
downloadpleroma-be8350baa2f8c9cf9be3f53ee4a0041dada1386f.tar.gz
pleroma-be8350baa2f8c9cf9be3f53ee4a0041dada1386f.zip
Merge branch 'develop' into feature/user-status-subscriptions
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs5
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