Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
credentials_controller.rb	make it not return http 400 when passing and empty source argument (#12259)	2019-11-16 19:02:09 +01:00
featured_tags_controller.rb	Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415)	2020-12-23 16:43:38 +01:00
follower_accounts_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	2020-09-11 15:16:29 +02:00
following_accounts_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	2020-09-11 15:16:29 +02:00
identity_proofs_controller.rb	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
lists_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	2020-09-11 15:16:29 +02:00
lookup_controller.rb	Add GET /api/v1/accounts/lookup REST API (#15740)	2021-02-16 15:28:32 +01:00
notes_controller.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
pins_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
relationships_controller.rb	Do not filter out temporarily-suspended accounts from relationships API	2020-09-28 17:56:16 +02:00
search_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
statuses_controller.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00