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. |
||
|---|---|---|
| .. | ||
| account_actions | ||
| account_warnings | ||
| accounts | ||
| action_logs | ||
| announcements | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| disputes/appeals | ||
| domain_allows | ||
| domain_blocks | ||
| email_domain_blocks | ||
| export_domain_allows | ||
| export_domain_blocks | ||
| follow_recommendations | ||
| instances | ||
| invites | ||
| ip_blocks | ||
| relationships | ||
| relays | ||
| report_notes | ||
| reports | ||
| roles | ||
| rules | ||
| settings | ||
| status_edits | ||
| statuses | ||
| tags | ||
| trends | ||
| users/roles | ||
| warning_presets | ||
| webhooks | ||