mastodon/spec/lib/activitypub
Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
..
activity Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01:00
adapter_spec.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
dereferencer_spec.rb Add support for dereferencing objects through bearcaps (#14683) 2020-08-30 12:34:20 +02:00
linked_data_signature_spec.rb Fixed code quality issues (#15541) 2021-01-31 21:26:09 +01:00
tag_manager_spec.rb Fix addressing of remote groups' followers (#16700) 2021-09-08 23:33:23 +02:00