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

Rescue from CharlockHolmes failures.
gitlabhq · Apr 24, 2012 · bbb93de · bbb93de
2 parents af99e4a + b53df22
commit bbb93de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/gitlabhq/encode.rb b/lib/gitlabhq/encode.rb
@@ -3,7 +3,7 @@ module Encode
     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