mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 03:37:04 +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. |
||
---|---|---|
.. | ||
account_associations.rb | ||
account_avatar.rb | ||
account_counters.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
account_merging.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
ldap_authenticable.rb | ||
lockable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
pam_authenticable.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_snapshot_concern.rb | ||
status_threading_concern.rb |