Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
base_controller.rb	Refactor Cache-Control and Vary definitions (#24347)	2023-04-19 16:07:29 +02:00
claims_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
collections_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
followers_synchronizations_controller.rb	Add Account.matches_uri_prefix scope and use in activitypub/followers_synchronizations controller (#28820)	2024-01-22 13:55:37 +00:00
inboxes_controller.rb	Move HTTP Signature parsing code to its own class (#28932)	2024-02-07 13:35:37 +00:00
outboxes_controller.rb	Refactor Cache-Control and Vary definitions (#24347)	2023-04-19 16:07:29 +02:00
replies_controller.rb	Refactor Cache-Control and Vary definitions (#24347)	2023-04-19 16:07:29 +02:00