mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 03:50:13 -05:00
0b2c7cdb02
Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`. |
||
|---|---|---|
| .. | ||
| blacklisted_email_validator_spec.rb | ||
| disallowed_hashtags_validator_spec.rb | ||
| email_mx_validator_spec.rb | ||
| existing_username_validator_spec.rb | ||
| follow_limit_validator_spec.rb | ||
| language_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 | ||