diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-15 09:30:23 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-15 09:30:23 -0500 |
| commit | 9d30bacaceaaec9fe2a7993b55149faef3516846 (patch) | |
| tree | d26ede9f244a11c7de36589cbf034bb2caf886a3 /config/test.exs | |
| parent | 80c21100db306ce45856bbdb97d3439676babeeb (diff) | |
| parent | 0fe36b311c010f9a4bd3c1600ce874c5403a7368 (diff) | |
| download | pleroma-9d30bacaceaaec9fe2a7993b55149faef3516846.tar.gz pleroma-9d30bacaceaaec9fe2a7993b55149faef3516846.zip | |
Merge branch 'develop' into refactor/notification_settings
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 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 |