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. |
||
|---|---|---|
| .. | ||
| disallowed_hashtags_validator.rb | ||
| domain_validator.rb | ||
| email_address_validator.rb | ||
| email_mx_validator.rb | ||
| empty_profile_field_names_validator.rb | ||
| existing_username_validator.rb | ||
| follow_limit_validator.rb | ||
| language_validator.rb | ||
| note_length_validator.rb | ||
| poll_expiration_validator.rb | ||
| poll_options_validator.rb | ||
| reaction_validator.rb | ||
| registration_form_time_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unique_username_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||
| user_email_validator.rb | ||
| vote_validator.rb | ||
| web_push_key_validator.rb | ||