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

gitlabhq
2 parents c9af8e75 bbb93de1
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -3,7 +3,7 @@ module Gitlabhq
3	3	extend self
4	4
5	5	def utf8 message
6		- hash = CharlockHolmes::EncodingDetector.detect(message)
	6	+ hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
7	7	if hash[:encoding]
8	8	CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
9	9	else
...	...