Claire 2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.		2023-12-19 20:51:37 +01:00
..
bookmarks_spec.rb	Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` (#25624)	2023-07-17 16:51:49 +02:00
favourites_spec.rb	Consolidate configuration of `Sidekiq::Testing.fake!` setup (#28046)	2023-11-23 09:43:43 +00:00
pins_spec.rb	Migrate to request specs in `/api/v1/statuses/:status_id/pin` (#25635)	2023-07-17 16:24:05 +02:00
sources_spec.rb	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00