mirror of
https://github.com/funamitech/mastodon
synced 2024-11-27 22:38:42 +09:00
9ae60f8738
Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file. |
||
|---|---|---|
| .. | ||
| 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 | ||