diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-02-22 12:38:37 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-03-01 11:18:26 +0300 |
| commit | c12b18c5452a096f878b3b58521d898e9963c172 (patch) | |
| tree | a3be4f446d8a9bc31c96e2a339d92378093767b1 /lib/gitlab/gitaly_client/repository_service.rb | |
| parent | 71545ca633fc66e40d05256083503ea9f97cdf1e (diff) | |
Encode revision for gitattributes ref
A field didn't call the needed encoding helper, thus some UTF-8 encoding
couldn't be encoded to ASCII. Using the helper method this was fixed.
Tests are now run against Gitaly and Rugged too, to ensure both remain
working correctly.
Fixes gitlab-org/gitaly#1032, gitlab-org/gitlab-ce#43278
Diffstat (limited to 'lib/gitlab/gitaly_client/repository_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index 603457d0664..d7e40471798 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -41,7 +41,7 @@ module Gitlab end def apply_gitattributes(revision) - request = Gitaly::ApplyGitattributesRequest.new(repository: @gitaly_repo, revision: revision) + request = Gitaly::ApplyGitattributesRequest.new(repository: @gitaly_repo, revision: encode_binary(revision)) GitalyClient.call(@storage, :repository_service, :apply_gitattributes, request) end |