Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system.		2024-07-15 18:51:38 +02:00
..
v1	Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream	2024-07-15 18:51:38 +02:00
v2	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
v2_alpha	Rename jobs/attachments rspec tag names (#29762)	2024-07-08 16:01:08 +00:00
web	Add coverage for sanitize failure path in api/web/embeds spec (#29851)	2024-04-04 16:07:16 +00:00