projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfix/funkwhale-channel' into 'develop'
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 33f1705dfc85e978320f5508e782dd91f37bbb8b..51850abb550813f8c02b2760cab54d19d6d45205 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-157,7
+157,7
@@
defmodule Pleroma.Application do
defp chat_enabled?, do: Pleroma.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()]