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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

blacklisted_email_validator.rb

…

disallowed_hashtags_validator.rb

…

email_mx_validator.rb

Add support for IPv6 only MXes in Email validation (#10009)

2019-02-12 14:48:04 +01:00

follow_limit_validator.rb

…

note_length_validator.rb

Change note length validation to ignore mention domains and URLs (#9717)

2019-01-05 07:16:46 +01:00

poll_validator.rb

Widen allowed time windows for polls (#10162)

2019-03-04 22:46:38 +01:00

status_length_validator.rb

…

status_pin_validator.rb

…

unique_username_validator.rb

…

unreserved_username_validator.rb

…

url_validator.rb

Change note length validation to ignore mention domains and URLs (#9717)

2019-01-05 07:16:46 +01:00

vote_validator.rb

Fix vote validation for polls with multiple choices (#10138)

2019-03-03 23:41:30 +01:00