luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 03:43:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/lib/activitypub
History
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
activity.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
adapter.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
case_transform.rb
dereferencer.rb
linked_data_signature.rb
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