mastodon-glitch/app/lib/activitypub
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
activity Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
parser Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
activity.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02: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
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 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