diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:32:21 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:32:21 -0500 |
| commit | 80c21100db306ce45856bbdb97d3439676babeeb (patch) | |
| tree | d143f523da262df5176220fbe6dc0b6370c91ebc /config/test.exs | |
| parent | ce85db41a30d95555bbd44d8931c4a3a357938d8 (diff) | |
| parent | 5d215fd81f529b639db9096ca71d4e7f0a6ed386 (diff) | |
| download | pleroma-80c21100db306ce45856bbdb97d3439676babeeb.tar.gz pleroma-80c21100db306ce45856bbdb97d3439676babeeb.zip | |
Merge branch 'develop' into refactor/notification_settings
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index e38b9967d..d45c36b7b 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,8 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true +config :pleroma, :instances_favicons, enabled: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |