pleroma

commit: acf215d983f7a57fb8375184e24d2e04eda74eb5
parent: b010f9733d6ee5c65cef276284e4c9d702f2c8b7
Author: kaniini <nenolod@gmail.com>
Date:   Fri, 15 Mar 2019 19:53:25 +0000

Merge branch 'enable-dedupe-by-default' into 'develop'

Enable dedupe by default

See merge request pleroma/pleroma!939
Diffstat:
M
config/config.exs
2
+-
M
config/test.exs
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -34,7 +34,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.
 # Upload configuration
 config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
-  filters: [],
+  filters: [Pleroma.Upload.Filter.Dedupe],
   link_name: true,
   proxy_remote: false,
   proxy_opts: [
diff --git a/config/test.exs b/config/test.exs
@@ -17,7 +17,7 @@ config :pleroma, Pleroma.Captcha,
 # Print only warnings and errors during test
 config :logger, level: :warn
 
-config :pleroma, Pleroma.Upload, link_name: false
+config :pleroma, Pleroma.Upload, filters: [], link_name: false
 
 config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads"