forked from glitch-soc-github-mirror/mastodon
baac429103
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. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||