From 72f2625586e9b159a8e18ddfb6783540cc91b9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Tue, 22 Aug 2017 16:38:39 -0300 Subject: Include missing Gitlab::GitalyClient.encode method in 9-5-stable --- lib/gitlab/gitaly_client.rb | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit v1.2.1