mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 06:46:29 +00:00
d8fdbb054e
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes. |
||
---|---|---|
.. | ||
blacklisted_email_validator_spec.rb | ||
disallowed_hashtags_validator_spec.rb | ||
email_mx_validator_spec.rb | ||
follow_limit_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 |