mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 09:33:42 +01:00
7452a95998
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them. |
||
---|---|---|
.. | ||
blacklisted_email_validator.rb | ||
disallowed_hashtags_validator.rb | ||
domain_validator.rb | ||
ed25519_key_validator.rb | ||
ed25519_signature_validator.rb | ||
email_mx_validator.rb | ||
existing_username_validator.rb | ||
follow_limit_validator.rb | ||
html_validator.rb | ||
import_validator.rb | ||
language_validator.rb | ||
note_length_validator.rb | ||
poll_validator.rb | ||
reaction_validator.rb | ||
registration_form_time_validator.rb | ||
status_length_validator.rb | ||
status_pin_validator.rb | ||
unique_username_validator.rb | ||
unreserved_username_validator.rb | ||
url_validator.rb | ||
vote_validator.rb |