diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2017-10-03 11:03:19 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-03 11:03:19 +0300 |
commit | 27cc1c2b2842a768ba631cf8418692bed8deb382 (patch) | |
tree | 5a74ffc5670d81c1a25afc1168e32da6df8a7e00 /lib/gitlab/gitaly_client.rb | |
parent | d14230dd6b9bdd94577b1e52f810e143278ff80e (diff) |
Fix for Gitaly nil encoding issue
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index e75e0500ed8..87b300dcf7e 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -233,6 +233,8 @@ module Gitlab end def self.encode(s) + return "" if s.nil? + s.dup.force_encoding(Encoding::ASCII_8BIT) end |