diff options
| author | feld <feld@feld.me> | 2019-11-11 19:14:06 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-11-11 19:14:06 +0000 |
| commit | e27d78e7687c6d0a1b7b6b66bc802b474a1e7e2f (patch) | |
| tree | bce2aa20a23ce9b27ffa5da43b9c5ef0fd483f61 /lib | |
| parent | 2cc043591c0d69a8793a70db39ddd2429b1c03f5 (diff) | |
| parent | b39b49cc146945ab86db272ae2cd1fe8fad3d9d5 (diff) | |
| download | pleroma-e27d78e7687c6d0a1b7b6b66bc802b474a1e7e2f.tar.gz pleroma-e27d78e7687c6d0a1b7b6b66bc802b474a1e7e2f.zip | |
Merge branch 'nodeinfo-federation-enabled' into 'develop'
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index d7ae503f6..486b9f6a4 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -46,6 +46,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do data |> Map.merge(%{quarantined_instances: quarantined}) + |> Map.put(:enabled, Config.get([:instance, :federating])) else %{} end |