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.rb	Allow Accept/Reject with a non-embedded object (#12199)	5 years ago
add.rb	…
announce.rb	Add support for inlined objects in activity audience (#14514)	4 years ago
block.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
create.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
delete.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
flag.rb	Change domain blocks to automatically support subdomains (#11138)	5 years ago
follow.rb	Change silences to always require approval on follow (#11975)	5 years ago
like.rb	…
move.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	4 years ago
remove.rb	…
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
update.rb	Dereference object URIs in Create and Update messages (#14359)	4 years ago