diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-29 11:46:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-29 11:46:06 +0000 |
| commit | 3dc5f04976293fbcedfc01281f89c4f54c995d59 (patch) | |
| tree | a5f7fc71bdd0e9a77874d56b8034c7c181883d97 /docs/config.md | |
| parent | dd8f2196f62ab4d4cdec67bdb2b434a317a3f396 (diff) | |
| parent | 9c782e59ddac5fa01cd5b2517f282b283f01bc1d (diff) | |
| download | pleroma-3dc5f04976293fbcedfc01281f89c4f54c995d59.tar.gz | |
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index 728916f82..0aeaf934e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -63,6 +63,7 @@ config :pleroma, Pleroma.Mailer, * `email`: Email used to reach an Administrator/Moderator of the instance * `description`: The instance’s description, can be seen in nodeinfo and ``/api/v1/instance`` * `limit`: Posts character limit (CW/Subject included in the counter) +* `remote_limit`: Hard character limit beyond which remote posts will be dropped. * `upload_limit`: File size limit of uploads (except for avatar, background, banner) * `avatar_upload_limit`: File size limit of user’s profile avatars * `background_upload_limit`: File size limit of user’s profile backgrounds |