summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKim Carlbäcker <kim.carlbacker@gmail.com>2017-11-02 08:29:03 +0000
committerDouwe Maan <douwe@gitlab.com>2017-11-02 08:29:03 +0000
commitd6066870cc38acde9a3608041e133ca64b6694c4 (patch)
tree5ecce5ef741d0a2c06ca82f27dda8d4d9044a3ba /lib
parente54dd249aa7abcdd2c6c888f45399028cb64bb97 (diff)
downloadgitlab-ce-d6066870cc38acde9a3608041e133ca64b6694c4.tar.gz
Fix encoding issue with Repository.ls_files
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/gitaly_client/commit_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index a2b50f2507e..da5505cb2fe 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -18,7 +18,7 @@ module Gitlab
response = GitalyClient.call(@repository.storage, :commit_service, :list_files, request)
response.flat_map do |msg|
- msg.paths.map { |d| d.dup.force_encoding(Encoding::UTF_8) }
+ msg.paths.map { |d| EncodingHelper.encode!(d.dup) }
end
end