Merge branch '210_twitter_api_uploads_alt_text' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d7869464ed7a41dce0c6e54577957b486a2c6e0b..8d2fdd40d7ba10de9abdd44c3160a2ae5994cb33 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -13,17 +13,10 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 # Upload configuration
 config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
-  # filters: [Pleroma.Upload.DedupeFilter, Pleroma.Upload.MogrifyFilter],
   filters: [],
   proxy_remote: false,
   proxy_opts: []
 
-# Strip Exif
-# Also put Pleroma.Upload.MogrifyFilter in the `filters` list of Pleroma.Upload configuration.
-# config :pleroma, Pleroma.Upload.MogrifyFilter,
-#  args: "strip"
-#  Pleroma.Upload.MogrifyFilter: [args: "strip"]
-
 config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
 config :pleroma, Pleroma.Uploaders.S3,
@@ -79,6 +72,7 @@ config :mime, :types, %{
 config :pleroma, :websub, Pleroma.Web.Websub
 config :pleroma, :ostatus, Pleroma.Web.OStatus
 config :pleroma, :httpoison, Pleroma.HTTP
+config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http, proxy_url: nil