Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Ondřej Hruška
2017-08-07 22:43:52 +02:00
82 changed files with 419 additions and 260 deletions

View File

@@ -104,7 +104,7 @@ class Formatter
html_attrs = { target: '_blank', rel: 'nofollow noopener' }
Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), normalized_url, html_attrs)
rescue Addressable::URI::InvalidURIError
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
encode(entity[:url])
end