projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index a3f36c9e169ff142ca00e14a588de81e8eb27712..894fa8d3d3eb541f5770d54d2cb565ebb2a570dd 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-17,7
+17,7
@@
config :pleroma, Pleroma.Captcha,
# Print only warnings and errors during test
config :logger, level: :warn
# Print only warnings and errors during test
config :logger, level: :warn
-config :pleroma, Pleroma.Upload, link_name: false
+config :pleroma, Pleroma.Upload,
filters: [],
link_name: false
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
@@
-48,7
+48,12
@@
config :web_push_encryption, :vapid_details,
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
-config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2]
+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"
try do
import_config "test.secret.exs"