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
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
parser	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-19 23:52:48 +01:00
activity.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
adapter.rb	Compact JSON-LD signed incoming activities (#17426)	2022-02-03 14:07:29 +01:00
case_transform.rb	Add serializing/unserializing of "locked" actor attribute (#4585)	2017-08-12 17:41:03 +02:00
dereferencer.rb	Add support for dereferencing objects through bearcaps (#14683)	2020-08-30 12:34:20 +02:00
linked_data_signature.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
tag_manager.rb	Fix addressing of remote groups' followers (#16700)	2021-09-08 23:33:23 +02:00