mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
7623e18124
Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different. |
||
|---|---|---|
| .. | ||
| 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 | ||