diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-07 19:28:23 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-07 19:28:23 +0200 |
| commit | b403ea4d2b69cef4434ad68babdfb402d8227847 (patch) | |
| tree | d07607b3387c89f4310881132a9e10a5389a5439 /config | |
| parent | a9b2ad17596d1b6deca646239a95e94dc644ebf3 (diff) | |
| parent | 60b4b0d725aefdca3eedd2d7708b0c96ee60c5f4 (diff) | |
| download | pleroma-b403ea4d2b69cef4434ad68babdfb402d8227847.tar.gz pleroma-b403ea4d2b69cef4434ad68babdfb402d8227847.zip | |
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 3826dddff..8f6fe00fb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -30,7 +30,9 @@ config :mime, :types, %{ "application/xrd+xml" => ["xrd+xml"] } -config :pleroma, :websub_verifier, Pleroma.Web.Websub +config :pleroma, :websub, Pleroma.Web.Websub +config :pleroma, :ostatus, Pleroma.Web.OStatus +config :pleroma, :httpoison, HTTPoison # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. diff --git a/config/test.exs b/config/test.exs index 5d91279a2..04136e1f2 100644 --- a/config/test.exs +++ b/config/test.exs @@ -25,4 +25,6 @@ config :pleroma, Pleroma.Repo, # Reduce hash rounds for testing config :comeonin, :pbkdf2_rounds, 1 -config :pleroma, :websub_verifier, Pleroma.Web.WebsubMock +config :pleroma, :websub, Pleroma.Web.WebsubMock +config :pleroma, :ostatus, Pleroma.Web.OStatusMock +config :pleroma, :httpoison, HTTPoisonMock |