4 Commits (15f6d2d038b9bea7e9638e20476459e5a43f0be1)

Author	SHA1	Message	Date
Claire	15f6d2d038	Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.	2024-05-01 17:22:02 +02:00
Matt Jankowski	34489591ec	Add `max_pinned_statuses` to instances serializer and api response (#29441)	2024-04-02 13:54:11 +00:00
Claire	6c00d5b0c4	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
Matt Jankowski	876f5b1d12	Convert `/instances/*` controller specs to request specs (#27988) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-20 11:05:28 +00:00