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
..
v1	Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream	2025-01-23 13:38:23 +01:00
v2	Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream	2025-01-28 18:29:46 +01:00
web	Use `expect` for api/v1 and api/web push subs controllers (#33682)	2025-01-22 14:55:44 +00:00
oembed_spec.rb	Add `response.content_type` checks for JSON to `api/v1` request specs (#31981)	2024-09-20 13:13:04 +00:00