diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-04 18:41:00 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-04 18:41:00 +0000 |
| commit | 114b95cee20c9bb4922627e5397a70d60e905fa6 (patch) | |
| tree | a188264fd550f9473ee3f1faa74d56ca9fd319fc /config | |
| parent | 4a602230e4b95e916b3df73bd88413b245e07de0 (diff) | |
| parent | a9e3e387c9798a810f82bbf92023b4d29abffbe5 (diff) | |
| download | pleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.tar.gz pleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.zip | |
Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 12f47389c..8d2fdd40d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -72,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 diff --git a/config/test.exs b/config/test.exs index 3aaed1b2c..6f6227c20 100644 --- a/config/test.exs +++ b/config/test.exs @@ -25,7 +25,7 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock -config :pleroma, :httpoison, HTTPoisonMock +config :tesla, adapter: Tesla.Mock try do import_config "test.secret.exs" |