From: feld <feld@feld.me>
Date: Wed, 1 Apr 2020 17:05:09 +0000 (+0000)
Subject: Merge branch 'gun' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc;p=akkoma

Merge branch 'gun' into 'develop'

Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
---

ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc
diff --cc lib/pleroma/application.ex
index 51850abb5,719114671..a00938c04
--- a/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()]