summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-08-22 16:38:39 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-08-22 16:41:47 -0300
commit72f2625586e9b159a8e18ddfb6783540cc91b9f9 (patch)
tree6526222587de8a8cfad04fd5763ca93b3e3f2677
parent613a02b4e7ddcdfaa187d59c70161b8722f06721 (diff)
downloadgitlab-ce-72f2625586e9b159a8e18ddfb6783540cc91b9f9.tar.gz
Include missing Gitlab::GitalyClient.encode method in 9-5-stable9-5-stable-patch-1
-rw-r--r--lib/gitlab/gitaly_client.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index c90ef282fdd..70177cd0fec 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -100,5 +100,9 @@ module Gitlab
path = Rails.root.join(SERVER_VERSION_FILE)
path.read.chomp
end
+
+ def self.encode(s)
+ s.dup.force_encoding(Encoding::ASCII_8BIT)
+ end
end
end