Commit 9906c6fb authored by rinpatch's avatar rinpatch

Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'

NodeInfo: Fix federating status not being reported when MRF transparency is disabled

Closes #1568

See merge request !2206
parents 18a56410 23049a07
Pipeline #22852 passed with stages
in 56 minutes and 56 seconds
...@@ -46,10 +46,10 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do ...@@ -46,10 +46,10 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
data data
|> Map.merge(%{quarantined_instances: quarantined}) |> Map.merge(%{quarantined_instances: quarantined})
|> Map.put(:enabled, Config.get([:instance, :federating]))
else else
%{} %{}
end end
|> Map.put(:enabled, Config.get([:instance, :federating]))
features = features =
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment