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. |
||
|---|---|---|
| .. | ||
| admin | ||
| auth | ||
| disputes | ||
| settings | ||
| about_spec.rb | ||
| captcha_spec.rb | ||
| filters_spec.rb | ||
| home_spec.rb | ||
| invites_spec.rb | ||
| log_in_spec.rb | ||
| log_out_spec.rb | ||
| media_spec.rb | ||
| new_statuses_spec.rb | ||
| oauth_spec.rb | ||
| ocr_spec.rb | ||
| privacy_spec.rb | ||
| profile_spec.rb | ||
| redirections_spec.rb | ||
| report_interface_spec.rb | ||
| severed_relationships_spec.rb | ||
| share_entrypoint_spec.rb | ||
| statuses_cleanup_spec.rb | ||
| tags_spec.rb | ||
| terms_of_service_spec.rb | ||
| unlogged_spec.rb | ||