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

b5fdacd1 · gitlabhq · c9af8e75 · bbb93de1 · b5fdacd1
Commit b5fdacd1 authored Apr 24, 2012 by gitlabhq
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlabhq/encode.rb lib/gitlabhq/encode.rb +1 -1

No files found.
--- 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