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.

Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2 years ago
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
parser	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
activity.rb	Refactor how Redis locks are created (#18400)	3 years ago
adapter.rb	Compact JSON-LD signed incoming activities (#17426)	3 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
forwarder.rb	Fix status updates not being forwarded like deletes through ActivityPub (#17648)	3 years ago
linked_data_signature.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	5 years ago
tag_manager.rb	Fix addressing of remote groups' followers (#16700)	3 years ago