mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09: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. |
||
|---|---|---|
| .. | ||
| account_batch.rb | ||
| admin_settings.rb | ||
| challenge.rb | ||
| custom_emoji_batch.rb | ||
| delete_confirmation.rb | ||
| domain_block_batch.rb | ||
| email_domain_block_batch.rb | ||
| ip_block_batch.rb | ||
| redirect.rb | ||
| status_filter_batch_action.rb | ||
| two_factor_confirmation.rb | ||