summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-25 11:57:23 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-25 11:57:23 -0500
commit479578b148f28f311a7d20f6da99bbc0dab1652c (patch)
tree2b0e5bfe6bfa5c4b954b9442d4d2a1d4ad4bc8cf /config/test.exs
parent98f8851f29f940051656caa1715820bce70f8c29 (diff)
parent361aa22e2862c1c914baf8257fdc8b20cbc7941d (diff)
downloadpleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.tar.gz
pleroma-479578b148f28f311a7d20f6da99bbc0dab1652c.zip
Merge branch 'develop' into feld-2168-media-preview-proxy
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 413c7f0b9..f0358e384 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -21,7 +21,10 @@ config :logger, :console,
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"