Merge branch 'gun' into 'develop'

Gun adapter

Closes #945

See merge request pleroma/pleroma!1861

diff --cc lib/pleroma/application.ex
index 51850abb550813f8c02b2760cab54d19d6d45205,719114671e6dbdb70dc15e7ba71611a18bd17c2b..a00938c04e26bd294f3b425ae9eea64ed1bf10b9
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -155,9 -169,9 +169,9 @@@ defmodule Pleroma.Application d
        type: :worker
      }
  
-   defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])
+   defp chat_enabled?, do: Config.get([:chat, :enabled])
  
 -  defp streamer_child(:test), do: []
 +  defp streamer_child(env) when env in [:test, :benchmark], do: []
  
    defp streamer_child(_) do
      [Pleroma.Web.Streamer.supervisor()]

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge