75580360cd
Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings. |
||
|---|---|---|
| .. | ||
| admin | ||
| 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 | ||
| audit_log_policy.rb | ||
| backup_policy.rb | ||
| canonical_email_block_policy.rb | ||
| custom_emoji_policy.rb | ||
| dashboard_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 | ||
| software_update_policy.rb | ||
| status_policy.rb | ||
| tag_policy.rb | ||
| user_policy.rb | ||
| user_role_policy.rb | ||
| webhook_policy.rb | ||