Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

blacklisted_email_validator.rb

Change e-mail whitelist/blacklist to not be checked when invited (#10683)

2019-05-03 23:44:44 +02:00

disallowed_hashtags_validator.rb

…

email_mx_validator.rb

…

existing_username_validator.rb

…

follow_limit_validator.rb

…

html_validator.rb

Change HTML validator to ignore all errors except unmatched tags (#10534)

2019-04-10 03:34:16 +02:00

note_length_validator.rb

…

poll_validator.rb

…

status_length_validator.rb

…

status_pin_validator.rb

changed pinned status count operator

2019-04-29 20:52:53 +02:00

unique_username_validator.rb

…

unreserved_username_validator.rb

…

url_validator.rb

…

vote_validator.rb

…