diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-14 21:47:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-14 21:47:02 +0000 |
| commit | 7ecc201029a8c90cf5dc3313ff78d56eb0a2445c (patch) | |
| tree | 44c63ed6430a743cfe589fed5213467a0dd6dabb /config | |
| parent | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff) | |
| parent | cbdd11c38111fd7c195983f40265b675e1201d4e (diff) | |
| download | pleroma-7ecc201029a8c90cf5dc3313ff78d56eb0a2445c.tar.gz pleroma-7ecc201029a8c90cf5dc3313ff78d56eb0a2445c.zip | |
Merge branch 'fix/filename-mangling' into 'develop'
Stop mangling filenames and enable dedupe by default
Closes #715
See merge request pleroma/pleroma!927
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index cd4c8e562..f889e3259 100644 --- a/config/config.exs +++ b/config/config.exs @@ -35,6 +35,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank. config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [], + link_name: true, proxy_remote: false, proxy_opts: [ redirect_on_failure: false, diff --git a/config/test.exs b/config/test.exs index 6dfa698c8..a3f36c9e1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,6 +17,8 @@ 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.Uploaders.Local, uploads: "test/uploads" config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test |