Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method. Added upstream's code. - `app/models/user_settings.rb`: Not a real conflict, glitch-soc has an extra setting textually-adjacent to a setting added upstream. Added upstream's setting. - `app/serializers/initial_state_serializer.rb`: Same. - `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. |
||
|---|---|---|
| .. | ||
| .dockerignore | ||
| .eslintrc.cjs | ||
| Dockerfile | ||
| database.js | ||
| errors.js | ||
| index.js | ||
| logging.js | ||
| metrics.js | ||
| package.json | ||
| redis.js | ||
| tsconfig.json | ||
| utils.js | ||