b7af3115a7
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
---|---|---|
.. | ||
admin | ||
account_moderation_note_policy_spec.rb | ||
account_policy_spec.rb | ||
account_warning_preset_policy_spec.rb | ||
announcement_policy_spec.rb | ||
appeal_policy_spec.rb | ||
backup_policy_spec.rb | ||
canonical_email_block_policy_spec.rb | ||
custom_emoji_policy_spec.rb | ||
delivery_policy_spec.rb | ||
domain_block_policy_spec.rb | ||
email_domain_block_policy_spec.rb | ||
follow_recommendation_policy_spec.rb | ||
instance_policy_spec.rb | ||
invite_policy_spec.rb | ||
ip_block_policy_spec.rb | ||
preview_card_policy_spec.rb | ||
preview_card_provider_policy_spec.rb | ||
relay_policy_spec.rb | ||
report_note_policy_spec.rb | ||
report_policy_spec.rb | ||
rule_policy_spec.rb | ||
settings_policy_spec.rb | ||
status_policy_spec.rb | ||
tag_policy_spec.rb | ||
user_policy_spec.rb | ||
webhook_policy_spec.rb |