summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2021-12-28 16:27:27 +0100
committermarcin mikołajczak <git@mkljczk.pl>2021-12-28 16:27:27 +0100
commit746c9daa62d591b0559768251889cccb025e7db0 (patch)
tree6c95e23bf0c3c3a76dc25e013a7dfccd3d8a98be /config/description.exs
parentf734579965b6f1a635e0622356e9cf6d4fff00bb (diff)
parentde7f84deb3ebe57744630950860f8fbf64a414a2 (diff)
downloadpleroma-746c9daa62d591b0559768251889cccb025e7db0.tar.gz
pleroma-746c9daa62d591b0559768251889cccb025e7db0.zip
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs11
1 files changed, 11 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs
index 1c8c3b4a0..ea3f34abe 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -936,6 +936,17 @@ config :pleroma, :config_description, [
key: :show_reactions,
type: :boolean,
description: "Let favourites and emoji reactions be viewed through the API."
+ },
+ %{
+ key: :profile_directory,
+ type: :boolean,
+ description: "Enable profile directory."
+ },
+ %{
+ key: :privileged_staff,
+ type: :boolean,
+ description:
+ "Let moderators access sensitive data (e.g. updating user credentials, get password reset token, delete users, index and read private statuses and chats)"
}
]
},