diff options
| author | lambda <lain@soykaf.club> | 2019-05-26 13:33:11 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-26 13:33:11 +0000 |
| commit | 5bb843ceece57cd88e8615b4a4519d2b40309295 (patch) | |
| tree | 02518ca75e71aabf6eeb47f7ac59bdc10fb265ba /config | |
| parent | d66cf4b2c4968c52aa1a9e5aa0abff571e336b96 (diff) | |
| parent | 56fd7dbdd7e3f1a0bb05430ed4805d8715e54935 (diff) | |
| download | pleroma-5bb843ceece57cd88e8615b4a4519d2b40309295.tar.gz pleroma-5bb843ceece57cd88e8615b4a4519d2b40309295.zip | |
Merge branch 'refactor/die-httpoison-die' into 'develop'
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index e90821d66..68168b279 100644 --- a/config/config.exs +++ b/config/config.exs @@ -184,9 +184,6 @@ config :mime, :types, %{ "application/ld+json" => ["activity+json"] } -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. diff --git a/config/test.exs b/config/test.exs index 6100989c4..41cddb9bd 100644 --- a/config/test.exs +++ b/config/test.exs @@ -39,8 +39,6 @@ config :pleroma, Pleroma.Repo, # Reduce hash rounds for testing config :pbkdf2_elixir, rounds: 1 -config :pleroma, :websub, Pleroma.Web.WebsubMock -config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :tesla, adapter: Tesla.Mock config :pleroma, :rich_media, enabled: false |