Download as
Browse Code »

Commit bbb93de17fefcbfc4cccb90d3f3e824fad200aba

Authored by Dmitriy Zaporozhets
2 parents af99e4af b53df221
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Rescue from CharlockHolmes failures.
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/gitlabhq/encode.rb
  Diff comments   View file @bbb93de
... ... @@ -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
... ...