Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.		2024-11-03 20:51:58 +01:00
..
base_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 '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +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
likes_controller.rb	Add reblogs and favourites counts to statuses in ActivityPub (#32007)	2024-09-23 13:14:15 +00:00
outboxes_controller.rb	Drop support for ruby 3.1 (#32363)	2024-10-31 15:12:08 +00:00
replies_controller.rb	Add reblogs and favourites counts to statuses in ActivityPub (#32007)	2024-09-23 13:14:15 +00:00
shares_controller.rb	Add reblogs and favourites counts to statuses in ActivityPub (#32007)	2024-09-23 13:14:15 +00:00