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
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
v2
web
base_controller.rb	Add logging of S3-related errors (#16381)	2021-07-21 18:34:39 +02:00
oembed_controller.rb