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 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2 years ago
..
accept_spec.rb	Add support for private pinned posts (#16954)	3 years ago
add_spec.rb	Fix unbounded recursion in post discovery (#23506)	2 years ago
announce_spec.rb	Autofix Rubocop Style/TrailingCommaInHashLiteral (#23693)	2 years ago
block_spec.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
create_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
delete_spec.rb	Fix processing of remote Delete activities (#16084)	4 years ago
flag_spec.rb	Autofix Rubocop Lint/ParenthesesAsGroupedExpression (#23682)	2 years ago
follow_spec.rb	Fix URI of repeat follow requests not being recorded (#15662)	4 years ago
like_spec.rb	Add ActivityPub inbox (#4216)	7 years ago
move_spec.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
reject_spec.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	4 years ago
remove_spec.rb	Fix #6657 - Use target instead of origin in Remove activity (#6664)	7 years ago
undo_spec.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
update_spec.rb	Fix poll updates being saved as status edits (#17373)	3 years ago