Merge branch 'encoding-helper-performance' into 'master'

Avoind unnecesary `force_encoding` operations

Closes #39227

See merge request gitlab-org/gitlab-ce!12167

(cherry picked from commit 371eb62bc90a70f4a578303215e1d4dfc430ddbb)

520866a0 Avoind unnecesary `force_encoding` operations

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb
index 7b3483a7f96..99dfee3dd9b 100644
--- a/lib/gitlab/encoding_helper.rb
+++ b/lib/gitlab/encoding_helper.rb
@@ -14,9 +14,9 @@ module Gitlab
     ENCODING_CONFIDENCE_THRESHOLD = 50
 
     def encode!(message)
-      return nil unless message.respond_to? :force_encoding
+      return nil unless message.respond_to?(:force_encoding)
+      return message if message.encoding == Encoding::UTF_8 && message.valid_encoding?
 
-      # if message is utf-8 encoding, just return it
       message.force_encoding("UTF-8")
       return message if message.valid_encoding?
 
@@ -50,6 +50,9 @@ module Gitlab
     end
 
     def encode_utf8(message)
+      return nil unless message.is_a?(String)
+      return message if message.encoding == Encoding::UTF_8 && message.valid_encoding?
+
       detect = CharlockHolmes::EncodingDetector.detect(message)
       if detect && detect[:encoding]
         begin