summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-11-15 14:27:59 +0000
committerlain <lain@soykaf.club>2021-11-15 14:27:59 +0000
commite2772d6bf1317616ef5a27396101bf44f123ee7e (patch)
treef6b409a3a096fa0fbf7bde70413b6dd7cf3f0725 /config/description.exs
parent6e3df116935a549a92b74bfc2be9a4197ad7a995 (diff)
parent762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0 (diff)
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs
index 7d1b29b23..1c8c3b4a0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1671,6 +1671,11 @@ config :pleroma, :config_description, [
description: "Whether to federate blocks to other instances"
},
%{
+ key: :blockers_visible,
+ type: :boolean,
+ description: "Whether a user can see someone who has blocked them"
+ },
+ %{
key: :sign_object_fetches,
type: :boolean,
description: "Sign object fetches with HTTP signatures"