Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
accept.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
add.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
announce.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +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	2022-02-08 18:23:53 +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 trending statuses (#17431)	2022-02-25 00:34:14 +01:00
move.rb	Fix race conditions on account migration creation (#15597)	2021-02-02 14:49:57 +01:00
reject.rb
remove.rb
undo.rb
update.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00