mirror of https://github.com/glitch-soc/mastodon
c85616ee3a
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. |
||
|---|---|---|
| .. | ||
| aliases | ||
| applications | ||
| deletes | ||
| exports | ||
| featured_tags | ||
| flavours | ||
| imports | ||
| login_activities | ||
| migration/redirects | ||
| migrations | ||
| preferences | ||
| privacy | ||
| profiles | ||
| shared | ||
| two_factor_authentication | ||
| two_factor_authentication_methods | ||
| verifications | ||