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
add.rb
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
flag.rb
follow.rb
like.rb
move.rb
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	2020-08-01 18:20:37 +02:00
remove.rb
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