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:38:39 -0300
commitcdf9f7c9b270490ea930fe5b02a4c5b77553c895 (patch)
tree47c631219660df119e373af10cb398f5ed3ab363
parent77bfdacdb8c616513f10b1f7d3e48aa9c90e0633 (diff)
downloadgitlab-ce-gitaly-fix.tar.gz
Include missing Gitlab::GitalyClient.encode method in 9-5-stablegitaly-fix
-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