mirror
/
glitch-soc
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
glitch-soc/app/serializers/rest/v1
History
Claire baac429103 Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
  In addition, upstream changed how notifications from follow subscriptions were
  handled, refactoring this file in the process.
  Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
 		2025-02-25 18:33:54 +01:00
..
filter_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
instance_serializer.rb Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3 2025-02-25 18:33:54 +01:00
notification_policy_serializer.rb Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00