Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.		2024-02-24 14:27:43 +01:00
..
admin	Move `api/v2/admin/accounts` to request spec (#28950)	2024-01-26 17:41:13 +00: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	Handle negative offset param in `api/v2/search` (#28282)	2023-12-19 10:55:39 +00:00
suggestions_spec.rb	Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string (#29108)	2024-02-06 17:10:17 +00:00