David Yip 4c1fd9a19c Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

2018-02-02 08:39:52 -06:00

..

blacklisted_email_validator.rb

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02:00

status_length_validator.rb

Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.

2017-11-14 17:56:38 +01:00

status_pin_validator.rb

Limit users to 50 lists, remove pagination from lists API (#5933)

2017-12-09 01:32:29 +01:00

unreserved_username_validator.rb

pam authentication (#5303)

2018-02-02 10:18:55 +01:00

url_validator.rb

Punycode URI normalization (#2370)

2017-04-25 02:47:31 +02:00