mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 20:40:31 -05: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. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| familiar_followers_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| lookup_controller_spec.rb | ||
| notes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||