diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
| commit | 38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch) | |
| tree | 740f32837d28e918f097c948d89827d99434d5b2 /config/test.exs | |
| parent | 8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff) | |
| parent | 3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff) | |
| download | pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.zip | |
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index e38b9967d..abcf793e5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -79,8 +79,8 @@ config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock config :pleroma, Oban, queues: false, - prune: :disabled, - crontab: false + crontab: false, + plugins: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, @@ -111,6 +111,13 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false 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 |