summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-01-07 16:25:39 +0000
committerlain <lain@soykaf.club>2021-01-07 16:25:39 +0000
commitac1298fce817e10cb357162441c77d860c4c757d (patch)
tree2575b88d1def1761423a340d18006eac95bf0363 /config
parentcf0eb0c1c5c945c660295f51c99fe157b2b8229c (diff)
parentd69c78ceb969c8bef50743d03308d145f0b08a75 (diff)
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236
Diffstat (limited to 'config')
-rw-r--r--config/config.exs8
1 files changed, 0 insertions, 8 deletions
diff --git a/config/config.exs b/config/config.exs
index d6d116314..7b14fbfe5 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -63,14 +63,6 @@ config :pleroma, Pleroma.Upload,
filters: [Pleroma.Upload.Filter.Dedupe],
link_name: false,
proxy_remote: false,
- proxy_opts: [
- redirect_on_failure: false,
- max_body_length: 25 * 1_048_576,
- http: [
- follow_redirect: true,
- pool: :upload
- ]
- ],
filename_display_max_length: 30,
default_description: nil