Commit b5fdacd153977748f16439689487be35c3699e9b
Exists in
master
and in
4 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/gitlabhq/encode.rb
| @@ -3,7 +3,7 @@ module Gitlabhq | @@ -3,7 +3,7 @@ module Gitlabhq | ||
| 3 | extend self | 3 | extend self |
| 4 | 4 | ||
| 5 | def utf8 message | 5 | def utf8 message |
| 6 | - hash = CharlockHolmes::EncodingDetector.detect(message) | 6 | + hash = CharlockHolmes::EncodingDetector.detect(message) rescue {} |
| 7 | if hash[:encoding] | 7 | if hash[:encoding] |
| 8 | CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8') | 8 | CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8') |
| 9 | else | 9 | else |