Merge commit 'c1f398ae93
' into kb-draft-15.9-lts
This commit is contained in:
commit
3eead356e7
207 changed files with 6055 additions and 3148 deletions
|
@ -90,10 +90,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
|||
},
|
||||
|
||||
polls: {
|
||||
max_options: PollValidator::MAX_OPTIONS,
|
||||
max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
|
||||
min_expiration: PollValidator::MIN_EXPIRATION,
|
||||
max_expiration: PollValidator::MAX_EXPIRATION,
|
||||
max_options: PollOptionsValidator::MAX_OPTIONS,
|
||||
max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
|
||||
min_expiration: PollExpirationValidator::MIN_EXPIRATION,
|
||||
max_expiration: PollExpirationValidator::MAX_EXPIRATION,
|
||||
allow_image: true,
|
||||
},
|
||||
|
||||
|
|
|
@ -82,10 +82,10 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
|
|||
},
|
||||
|
||||
polls: {
|
||||
max_options: PollValidator::MAX_OPTIONS,
|
||||
max_characters_per_option: PollValidator::MAX_OPTION_CHARS,
|
||||
min_expiration: PollValidator::MIN_EXPIRATION,
|
||||
max_expiration: PollValidator::MAX_EXPIRATION,
|
||||
max_options: PollOptionsValidator::MAX_OPTIONS,
|
||||
max_characters_per_option: PollOptionsValidator::MAX_OPTION_CHARS,
|
||||
min_expiration: PollExpirationValidator::MIN_EXPIRATION,
|
||||
max_expiration: PollExpirationValidator::MAX_EXPIRATION,
|
||||
allow_image: true,
|
||||
},
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue