summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-08-23 15:51:22 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-23 15:51:22 +0000
commit2b906219a0a74fc54bafce8f057463c83e0611b6 (patch)
tree7e784226d9a6bd2988346266ba3f684cebf14364
parent75d1283e59b296616ed1592de9856fc3d049f1ef (diff)
parent9240d3552a0850dc3a7a661012c51af12c9f6457 (diff)
downloadgitlab-ce-2b906219a0a74fc54bafce8f057463c83e0611b6.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.rb4
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 8fb7341b2dc..57f42bd35ee 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -175,8 +175,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)