Commit e851cb07 authored by Saito's avatar Saito

must force_encoding to utf-8 first

parent c62715ac
...@@ -8,12 +8,12 @@ module Gitlab ...@@ -8,12 +8,12 @@ module Gitlab
# return nil if message is nil # return nil if message is nil
return nil unless message return nil unless message
message.force_encoding("utf-8")
# return message if message type is binary # return message if message type is binary
detect = CharlockHolmes::EncodingDetector.detect(message) detect = CharlockHolmes::EncodingDetector.detect(message)
return message if detect[:type] == :binary return message if detect[:type] == :binary
# if message is utf-8 encoding, just return it # if message is utf-8 encoding, just return it
message.force_encoding("utf-8")
return message if message.valid_encoding? return message if message.valid_encoding?
# if message is not utf-8 encoding, convert it # if message is not utf-8 encoding, convert it
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment