mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
178e151019
Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars. |
||
|---|---|---|
| .. | ||
| blacklisted_email_validator_spec.rb | ||
| disallowed_hashtags_validator_spec.rb | ||
| email_mx_validator_spec.rb | ||
| follow_limit_validator_spec.rb | ||
| note_length_validator_spec.rb | ||
| poll_validator_spec.rb | ||
| reaction_validator_spec.rb | ||
| status_length_validator_spec.rb | ||
| status_pin_validator_spec.rb | ||
| unique_username_validator_spec.rb | ||
| unreserved_username_validator_spec.rb | ||
| url_validator_spec.rb | ||