summaryrefslogtreecommitdiff
path: root/docs/config.md
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-03 12:19:19 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-03 12:19:19 +0000
commit9789e000b05621435dc0c03833f564481e0b80e6 (patch)
treee2625834287cb13a3951c93886ae080ed58c1484 /docs/config.md
parentd33d248b69c77a7ab712cfe4b727c0000a77f4ea (diff)
parentdc91bcc0afc82ddd52a617352e0e4e89e1a1d61c (diff)
downloadpleroma-9789e000b05621435dc0c03833f564481e0b80e6.tar.gz
pleroma-9789e000b05621435dc0c03833f564481e0b80e6.zip
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
Polls 2 Electric Boogalo Closes #657 See merge request pleroma/pleroma!1190
Diffstat (limited to 'docs/config.md')
-rw-r--r--docs/config.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index 67b062fe9..4797879d6 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -71,6 +71,11 @@ config :pleroma, Pleroma.Emails.Mailer,
* `avatar_upload_limit`: File size limit of user’s profile avatars
* `background_upload_limit`: File size limit of user’s profile backgrounds
* `banner_upload_limit`: File size limit of user’s profile banners
+* `poll_limits`: A map with poll limits for **local** polls
+ * `max_options`: Maximum number of options
+ * `max_option_chars`: Maximum number of characters per option
+ * `min_expiration`: Minimum expiration time (in seconds)
+ * `max_expiration`: Maximum expiration time (in seconds)
* `registrations_open`: Enable registrations for anyone, invitations can be enabled when false.
* `invites_enabled`: Enable user invitations for admins (depends on `registrations_open: false`).
* `account_activation_required`: Require users to confirm their emails before signing in.