Claire 5c962d77bb Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02:00
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-22 10:06:11 +02:00
v2	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
web	Enable Rubocop HTTP status rules (#23717)	2023-02-20 11:16:40 +09:00
base_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
oembed_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00