diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2018-12-01 08:26:59 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2018-12-04 14:03:32 +0300 |
| commit | 3ce16e5a56be01686a03f40931f666ac164df6e8 (patch) | |
| tree | c5db9f5efa5303409100bdf60f5f9049ec29644a /config | |
| parent | 88b05aeabb23412530f6b74934bc3d2d3fe8c29f (diff) | |
| download | pleroma-3ce16e5a56be01686a03f40931f666ac164df6e8.tar.gz pleroma-3ce16e5a56be01686a03f40931f666ac164df6e8.zip | |
init tesla and updated the http requests in Pleroma.Web.Websub
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 1 |
2 files changed, 2 insertions, 0 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..e259a9c65 100644 --- a/config/test.exs +++ b/config/test.exs @@ -26,6 +26,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" |