diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-23 15:51:22 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-08-25 10:19:24 +1000 |
| commit | fcbca7d9b4becd1302b98a5df075460bc07a2cf3 (patch) | |
| tree | fac79014839d022c27d0d908f152c0e8beca6598 | |
| parent | ccdc260488d0b5cea631598ce3d9f4335817d92e (diff) | |
| download | gitlab-ce-fcbca7d9b4becd1302b98a5df075460bc07a2cf3.tar.gz | |
Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'
Properly encode Gitaly RawBlame request params
See merge request !13764
| -rw-r--r-- | lib/gitlab/gitaly_client/commit_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb index 620e56ee6f1..19827a123de 100644 --- a/lib/gitlab/gitaly_client/commit_service.rb +++ b/lib/gitlab/gitaly_client/commit_service.rb @@ -159,8 +159,8 @@ module Gitlab def raw_blame(revision, path) request = Gitaly::RawBlameRequest.new( repository: @gitaly_repo, - revision: revision, - path: path + revision: GitalyClient.encode(revision), + path: GitalyClient.encode(path) ) response = GitalyClient.call(@repository.storage, :commit_service, :raw_blame, request) |