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 git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
[akkoma]
/
config
/
test.exs
diff --git
a/config/test.exs
b/config/test.exs
index abcf793e5934138b3384d615c6881dfd0429745b..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"
@@
-118,6
+121,10
@@
config :pleroma, Pleroma.Uploaders.S3,
streaming_enabled: true,
public_endpoint: 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