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 de7f936b96 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		3 years ago
..
accept_spec.rb	Add support for private pinned posts (#16954)	3 years ago
add_spec.rb	Add support for private pinned posts (#16954)	3 years ago
announce_spec.rb	Add support for inlined objects in activity audience (#14514)	4 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	4 years ago
delete_spec.rb	Fix processing of remote Delete activities (#16084)	4 years ago
flag_spec.rb	Set and store report URIs (#10303)	6 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 race conditions on account migration creation (#15597)	4 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	Add joined date to profiles in web UI (#16169)	4 years ago