Jeremy Kescher 9fe04326ea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb		2023-05-09 23:26:00 +02:00
..
activity	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
parser	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
activity.rb	Merge remote-tracking branch 'upstream/main' into develop	2023-03-05 12:34:16 +01:00
adapter.rb	Compact JSON-LD signed incoming activities (#17426)	2022-02-03 14:07:29 +01:00
case_transform.rb	Fix Performance/DeletePrefix cop (#24796)	2023-05-02 21:07:45 +02:00
dereferencer.rb	Remove instance variables from helper usage (#24203)	2023-04-23 22:35:54 +02:00
forwarder.rb	Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034)	2023-03-15 03:45:15 +01:00
linked_data_signature.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
tag_manager.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00