Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method. Added upstream's code. - `app/models/user_settings.rb`: Not a real conflict, glitch-soc has an extra setting textually-adjacent to a setting added upstream. Added upstream's setting. - `app/serializers/initial_state_serializer.rb`: Same. - `app/services/precompute_feed_service.rb`: Not a real conflict, glitch-soc has extra code for the direct feed. Added upstream's new code for populating lists.		2025-02-01 19:07:13 +01:00
..
v1	Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream	2025-01-23 13:38:23 +01:00
v2	Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream	2025-02-01 19:07:13 +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