From b57383e025db2f6b0e3733960f4622ffe26c3f65 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Sun, 10 Mar 2019 09:57:21 +0000 Subject: increase polls to 6 opts x 111 chars --- app/javascript/mastodon/features/compose/components/poll_form.js | 4 ++-- app/validators/poll_validator.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js index 211601d52..43430ac08 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.js +++ b/app/javascript/mastodon/features/compose/components/poll_form.js @@ -77,7 +77,7 @@ class Option extends React.PureComponent {
- {options.size < 4 && ( + {options.size < 6 && ( )} diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb index 9d7321cad..9efe5d567 100644 --- a/app/validators/poll_validator.rb +++ b/app/validators/poll_validator.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true class PollValidator < ActiveModel::Validator - MAX_OPTIONS = 4 - MAX_OPTION_CHARS = 25 + MAX_OPTIONS = 6 + MAX_OPTION_CHARS = 111 MAX_EXPIRATION = 1.month.freeze MIN_EXPIRATION = 5.minutes.freeze -- cgit