projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e38b9967d67a387031ad58d0b50b22458d45fd54..f0358e3845569226841c0fe6132058686c32baa0 100644
(file)
--- a/
config/test.exs
+++ b/
config/test.exs
@@
-21,7
+21,10
@@
config :logger, :console,
config :pleroma, :auth, oauth_consumer_strategies: []
config :pleroma, :auth, oauth_consumer_strategies: []
-config :pleroma, Pleroma.Upload, filters: [], link_name: false
+config :pleroma, Pleroma.Upload,
+ filters: [],
+ link_name: false,
+ default_description: :filename
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"
@@
-79,8
+82,8
@@
config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
config :pleroma, Oban,
queues: false,
config :pleroma, Oban,
queues: false,
-
prune: :disabled
,
-
crontab
: false
+
crontab: false
,
+
plugins
: false
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 2,
@@
-111,6
+114,17
@@
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
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
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else