Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.		2022-03-26 19:18:55 +01:00
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
parser	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
activity.rb	Fix not updating a status when newer version is fetched manually (#17745)	2022-03-12 09:11:36 +01:00
adapter.rb	Compact JSON-LD signed incoming activities (#17426)	2022-02-03 14:07:29 +01:00
case_transform.rb
dereferencer.rb
forwarder.rb	Fix status updates not being forwarded like deletes through ActivityPub (#17648)	2022-02-26 17:51:59 +01:00
linked_data_signature.rb
serializer.rb
tag_manager.rb