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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| statuses | ||
| well_known | ||
| account_show_page_spec.rb | ||
| accounts_spec.rb | ||
| anonymous_cookies_spec.rb | ||
| backups_spec.rb | ||
| cache_spec.rb | ||
| catch_all_route_request_spec.rb | ||
| content_security_policy_spec.rb | ||
| custom_css_spec.rb | ||
| disabled_oauth_endpoints_spec.rb | ||
| emojis_spec.rb | ||
| filters_spec.rb | ||
| follower_accounts_spec.rb | ||
| following_accounts_spec.rb | ||
| health_spec.rb | ||
| instance_actor_spec.rb | ||
| invite_spec.rb | ||
| invites_spec.rb | ||
| link_headers_spec.rb | ||
| localization_spec.rb | ||
| log_out_spec.rb | ||
| mail_subscriptions_spec.rb | ||
| manifest_spec.rb | ||
| media_proxy_spec.rb | ||
| media_spec.rb | ||
| omniauth_callbacks_spec.rb | ||
| relationships_spec.rb | ||
| remote_interaction_helper_spec.rb | ||
| self_destruct_spec.rb | ||
| severed_relationships_spec.rb | ||
| signature_verification_spec.rb | ||
| statuses_cleanup_spec.rb | ||
| statuses_spec.rb | ||
| tags_spec.rb | ||