Commit graph

4 commits

Author SHA1 Message Date
Claire
9d5a9123b9 Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream 2025-03-07 13:15:10 +01:00
Matt Jankowski
d90d68bddf
Remove deprecated mb_chars method (#34039) 2025-03-03 16:50:57 +00:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
2025-01-28 18:29:46 +01:00
Claire
32aa83e9d7
Fix polls not being validated on edition (#33755) 2025-01-28 14:38:18 +00:00
Renamed from app/validators/poll_validator.rb (Browse further)