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 8c3c27bf06 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
..
accept_spec.rb	Display pending message on admin relays UI (#8494)	6 years ago
add_spec.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 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 'master' into glitch-soc/merge-upstream	4 years ago
delete_spec.rb	Fix too many forwards (#5854)	7 years ago
flag_spec.rb	Set and store report URIs (#10303)	6 years ago
follow_spec.rb	Change silences to always require approval on follow (#11975)	5 years ago
like_spec.rb	Add ActivityPub inbox (#4216)	7 years ago
move_spec.rb	Add handler for Move activity (#9629)	6 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 ActivityPub context not being dynamically computed (#11746)	5 years ago