about summary refs log tree commit diff
path: root/app/lib/formatter.rb
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-08-07 22:43:52 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-08-07 22:43:52 +0200
commit7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch)
tree36fbf6f3d2019cc345d33fe555569ec750a66957 /app/lib/formatter.rb
parentb8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff)
parenta3e53bd442752f210db2025f2dfc45e7599354c2 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r--app/lib/formatter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 7b89305ac..cacc0364f 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -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