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
..
base_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
claims_controller.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
collections_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
followers_synchronizations_controller.rb	Fix followers synchronization mechanism not working when URI has empty path (#16744)	2021-09-15 18:51:16 +02:00
inboxes_controller.rb	Skip processing Update activities on unknown accounts (#15514)	2021-01-08 12:26:29 +01:00
outboxes_controller.rb	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	2021-07-03 21:13:47 +02:00
replies_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00