diff options
| author | lain <lain@soykaf.club> | 2020-08-04 11:00:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-04 11:00:30 +0000 |
| commit | 28584bb2241c600fc6150fdae49b1eea6bd420e0 (patch) | |
| tree | 18f8334bdd3daffed7b033492539e3b867e8d15f /docs/configuration | |
| parent | e3953923aca1706ab508bfda1ab892304b29c09a (diff) | |
| parent | 2f4289d455fbd2d949ac1e10d5ea2b9c78f15e82 (diff) | |
| download | pleroma-28584bb2241c600fc6150fdae49b1eea6bd420e0.tar.gz | |
Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 5 |
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`) |