Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.		2024-05-01 19:30:41 +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 '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream	2024-03-15 12:20:32 +01: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	Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560)	2024-03-15 10:40:21 +00:00
replies_controller.rb	Add scope `Status.distributable_visibility` (#29950)	2024-04-16 13:16:54 +00:00