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 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
activity	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
activity.rb	Add support for dereferencing objects through bearcaps (#14683)	4 years ago
adapter.rb	Add support for direct message assertions	4 years ago
case_transform.rb	Add serializing/unserializing of "locked" actor attribute (#4585)	7 years ago
dereferencer.rb	Add support for dereferencing objects through bearcaps (#14683)	4 years ago
linked_data_signature.rb	Add CLI task for rotating keys (#8466)	6 years ago
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	5 years ago
tag_manager.rb	Improve group processing (#14279)	4 years ago