projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/issue-1729' into 'develop'
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 719114671e6dbdb70dc15e7ba71611a18bd17c2b..308d8cffa661ad3cf1ab8cf3dfb3845fcda1a8d4 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-73,7
+73,6
@@
defmodule Pleroma.Application do
Pleroma.Repo,
Config.TransferTask,
Pleroma.Emoji,
Pleroma.Repo,
Config.TransferTask,
Pleroma.Emoji,
- Pleroma.Captcha,
Pleroma.Plugs.RateLimiter.Supervisor
] ++
cachex_children() ++
Pleroma.Plugs.RateLimiter.Supervisor
] ++
cachex_children() ++
@@
-171,7
+170,7
@@
defmodule Pleroma.Application do
defp chat_enabled?, do: 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()]
defp streamer_child(_) do
[Pleroma.Web.Streamer.supervisor()]