summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/encoding_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb
index 781f9c56a42..83a1020e54e 100644
--- a/lib/gitlab/encoding_helper.rb
+++ b/lib/gitlab/encoding_helper.rb
@@ -17,6 +17,10 @@ module Gitlab
return nil unless message.respond_to? :force_encoding
# if message is utf-8 encoding, just return it
+ if message.encoding == Encoding::UTF_8 && message.valid_encoding?
+ return message
+ end
+
message.force_encoding("UTF-8")
return message if message.valid_encoding?