diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:17:41 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-29 16:17:41 +0000 |
| commit | 3b8cd27b053e08bfb06a248033477efdb9e78684 (patch) | |
| tree | f291500d44adbd07f560c8ba0d53ee9b1bfb29c3 /lib | |
| parent | 8be01540948ff62460a5c21663dfff6c358002a1 (diff) | |
| parent | 0bee2131ce55ffd702ddc92800499b01b86d3765 (diff) | |
| download | pleroma-3b8cd27b053e08bfb06a248033477efdb9e78684.tar.gz | |
Merge branch 'mailer-enabled-nodeinfo' into 'develop'
Add `mailerEnabled` to the NodeInfo metadata
See merge request pleroma/pleroma!1502
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 a1d7fcc7d..54f89e65c 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -165,6 +165,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do }, accountActivationRequired: Config.get([:instance, :account_activation_required], false), invitesEnabled: Config.get([:instance, :invites_enabled], false), + mailerEnabled: Config.get([Pleroma.Emails.Mailer, :enabled], false), features: features, restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]), skipThreadContainment: Config.get([:instance, :skip_thread_containment], false) |