Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index d45c36b7bcd8e1f9dd561ff32475f784a5b04e5c..413c7f0b91ab2f81937d13c0a0a3b6c6d185aff8 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -113,6 +113,15 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
 config :pleroma, :instances_favicons, enabled: true
 
+config :pleroma, Pleroma.Uploaders.S3,
+  bucket: nil,
+  streaming_enabled: true,
+  public_endpoint: nil
+
+config :tzdata, :autoupdate, :disabled
+
+config :pleroma, :mrf, policies: []
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else