Merge pull request #704 from tader/workaround-charlock-holmes

Rescue from CharlockHolmes failures.
2012-04-24 03:55:03 -07:00 · 2012-04-24 03:55:03 -07:00 · bbb93de17f
parent af99e4afe1 b53df22127
commit bbb93de17f
1 changed files with 1 additions and 1 deletions
--- a/lib/gitlabhq/encode.rb
+++ b/lib/gitlabhq/encode.rb
@ -3,7 +3,7 @@ module Gitlabhq
    extend self

    def utf8 message
-      hash = CharlockHolmes::EncodingDetector.detect(message)
+      hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
      if hash[:encoding]
        CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
      else