Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
base_controller.rb	Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)	2024-03-15 10:40:21 +00:00
claims_controller.rb	Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)	2024-03-15 10:40:21 +00:00
collections_controller.rb	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
followers_synchronizations_controller.rb	Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)	2024-03-15 10:40:21 +00:00
inboxes_controller.rb	Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)	2024-03-15 10:40:21 +00:00
outboxes_controller.rb	Rename cache_* methods to preload_* in controller concern (#30209)	2024-05-16 08:03:46 +00:00
replies_controller.rb	Add scope Status.distributable_visibility (#29950)	2024-04-16 13:16:54 +00:00