Claire 784e38f70b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01: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 trending links (#16917)	2021-11-25 13:07:38 +01:00
block.rb	Fix processing of incoming Block activities (#15546)	2021-01-12 09:25:01 +01:00
create.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
delete.rb	Fix processing of remote Delete activities (#16084)	2021-04-21 04:46:09 +02:00
flag.rb	Fix reports of already suspended accounts being recorded (#16047)	2021-04-16 22:01:05 +02:00
follow.rb	Fix URI of repeat follow requests not being recorded (#15662)	2021-02-11 01:53:44 +01:00
like.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
move.rb	Fix race conditions on account migration creation (#15597)	2021-02-02 14:49:57 +01: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