mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-24 07:43:24 +00:00
4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
|---|---|---|
| .. | ||
| 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 | ||