mastodon/app/lib/activitypub
Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
2023-07-12 15:27:32 +02:00
..
activity Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
parser Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
activity.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +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
tag_manager.rb Allow reports with long comments from remote instances, but truncate (#25028) 2023-05-22 13:15:21 +02:00