Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.		2023-12-21 18:17:17 +01:00
..
filters_spec.rb	Reduce `.times` usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
instance_spec.rb	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
media_spec.rb	Add coverage for `api/v2/media` endpoint (#28027)	2023-11-22 15:39:34 +00:00
search_spec.rb	Convert `api/v2/search` controller spec to request spec (#28269)	2023-12-08 09:27:33 +00:00
suggestions_spec.rb	Controller spec to request spec: `api/v2/suggestions` (#28297)	2023-12-11 08:13:57 +00:00