You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		4 years ago
..
base_controller.rb	Add whitelist mode (#11291)	5 years ago
claims_controller.rb	Add E2EE API (#13820)	5 years ago
collections_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
inboxes_controller.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
outboxes_controller.rb	Add outbox attribute to instance actor (#14721)	4 years ago
replies_controller.rb	Add more tests for ActivityPub controllers (#13585)	5 years ago