mirror of
https://github.com/funamitech/mastodon
synced 2024-11-27 22:38:42 +09:00
5a55180b95
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Upstream rewrote top-level `describe` calls to `RSpec.describe`, and glitch-soc had differences in the first few tests because of the wider subset of HTML it accepts. Changed `describe` to `RSpec.describe` as upstream did, keeping glitch-soc's tests. |
||
---|---|---|
.. | ||
admin | ||
filters | ||
notifications | ||
filters_spec.rb | ||
instance_spec.rb | ||
media_spec.rb | ||
search_spec.rb | ||
suggestions_spec.rb |