mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-26 23:03:41 +01:00
1fbd1fa5c4
Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`. |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| account_warning_policy.rb | ||
| account_warning_preset_policy.rb | ||
| announcement_policy.rb | ||
| appeal_policy.rb | ||
| application_policy.rb | ||
| backup_policy.rb | ||
| custom_emoji_policy.rb | ||
| delivery_policy.rb | ||
| domain_allow_policy.rb | ||
| domain_block_policy.rb | ||
| email_domain_block_policy.rb | ||
| follow_recommendation_policy.rb | ||
| instance_policy.rb | ||
| invite_policy.rb | ||
| ip_block_policy.rb | ||
| poll_policy.rb | ||
| preview_card_policy.rb | ||
| preview_card_provider_policy.rb | ||
| relay_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| rule_policy.rb | ||
| settings_policy.rb | ||
| status_policy.rb | ||
| tag_policy.rb | ||
| user_policy.rb | ||