aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAngelina Filippova <linakirsanova@gmail.com>2020-08-07 21:05:44 +0300
committerAngelina Filippova <linakirsanova@gmail.com>2020-08-07 21:05:44 +0300
commitf21b6ebd5d71b77b1f2b7c8918005c3b70752c15 (patch)
tree7beddc568e0e1430ab6bc8fdbc4c6d9d04744d49 /docs
parent8e1f7a3eff05a43f59f15dc6fa0483713e221fa7 (diff)
parent8e90cc58e7ec3f19f03d049ff541750f1ab4774e (diff)
downloadpleroma-f21b6ebd5d71b77b1f2b7c8918005c3b70752c15.tar.gz
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/cheatsheet.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 5891fc9b0..f23cf4fe4 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -207,6 +207,11 @@ config :pleroma, :mrf_user_allowlist, %{
* `sign_object_fetches`: Sign object fetches with HTTP signatures
* `authorized_fetch_mode`: Require HTTP signatures for AP fetches
+## Pleroma.User
+
+* `restricted_nicknames`: List of nicknames users may not register with.
+* `email_blacklist`: List of email domains users may not register with.
+
## Pleroma.ScheduledActivity
* `daily_user_limit`: the number of scheduled activities a user is allowed to create in a single day (Default: `25`)