diff options
| author | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
| commit | 76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed (patch) | |
| tree | 5308f2d4c169085dfbe22a95a86c5271e4285ace /config | |
| parent | 3ea4476445a5e9b6ec1625d7caa537f79254e9d0 (diff) | |
| parent | 5f0c2372bc8be3763b649b13ee142c273583329e (diff) | |
| download | pleroma-76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed.tar.gz pleroma-76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed.zip | |
Merge remote-tracking branch 'origin' into follower-hiding
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" |