Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests. |
||
|---|---|---|
| .. | ||
| has_settings.rb | ||
| ldap_authenticable.rb | ||
| omniauthable.rb | ||
| pam_authenticable.rb | ||