mirror of https://github.com/Siphonay/mastodon
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. |
||
|---|---|---|
| .. | ||
| account_relationships_presenter_spec.rb | ||
| familiar_followers_presenter_spec.rb | ||
| instance_presenter_spec.rb | ||
| status_relationships_presenter_spec.rb | ||