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.		2020-08-30 16:13:08 +02:00
..
accept.rb	Allow Accept/Reject with a non-embedded object (#12199)	2019-10-24 22:45:43 +02:00
add.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	2018-05-18 11:33:56 +02:00
announce.rb	Add support for inlined objects in activity audience (#14514)	2020-08-24 14:11:47 +02:00
block.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	2020-07-22 11:45:35 +02:00
create.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
delete.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
flag.rb	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
follow.rb	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
like.rb	Handle duplicate ActivityPub activities (#4639)	2017-08-20 16:53:47 +02:00
move.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	2020-08-01 18:20:37 +02:00
remove.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	2018-05-18 11:33:56 +02:00
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	2020-07-22 11:45:35 +02:00
update.rb	Dereference object URIs in Create and Update messages (#14359)	2020-07-22 11:43:17 +02:00