Merge branch 'master' of github.com:gitlabhq/gitlabhq

2012-04-24 17:52:10 +03:00 · 2012-04-24 17:52:10 +03:00 · b5fdacd153
parent c9af8e7579 bbb93de17f
commit b5fdacd153
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