summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-08 10:55:03 +0000
committerlain <lain@soykaf.club>2020-07-08 10:55:03 +0000
commit6335b32aa8f5c54cf5f09638189a77cad5785077 (patch)
tree5b30a357982a9a04cadf0ea7f1ccb905f50db270 /config/description.exs
parenta8447c3803b9d618f8c1d1910698c8cca6e908e4 (diff)
parenta6495f4a686feb3d4728432dd075f425c04c32dd (diff)
downloadpleroma-6335b32aa8f5c54cf5f09638189a77cad5785077.tar.gz
pleroma-6335b32aa8f5c54cf5f09638189a77cad5785077.zip
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs
index 650610fbe..705ba83d0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -700,8 +700,9 @@ config :pleroma, :config_description, [
key: :public,
type: :boolean,
description:
- "Makes the client API in authentificated mode-only except for user-profiles." <>
- " Useful for disabling the Local Timeline and The Whole Known Network."
+ "Makes the client API in authenticated mode-only except for user-profiles." <>
+ " Useful for disabling the Local Timeline and The Whole Known Network. " <>
+ " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting."
},
%{
key: :quarantined_instances,