Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ...

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.

2021-05-07 18:21:59 +02:00

..

accept.rb

Allow Accept/Reject with a non-embedded object (#12199)

2019-10-24 22:45:43 +02:00

add.rb

…

announce.rb

Change trending hashtags to be affected be reblogs (#16164)

2021-05-07 14:33:43 +02: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-05-07 18:21:59 +02: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

…

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