aboutsummaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-07-11 10:36:36 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-07-12 12:41:40 +0300
commitb3764423251c963a5ca007517189f556bfe95155 (patch)
treed9f0c2aa9a7c69a267487e88298714a7bc5a442c /config/test.exs
parentd6f67fa91b00b28d7be9f82bb300f9d650c73744 (diff)
downloadpleroma-b3764423251c963a5ca007517189f556bfe95155.tar.gz
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
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 d45c36b7b..abcf793e5 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -113,6 +113,11 @@ 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
+
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else