Skip to content
Snippets Groups Projects
Commit cf1a1e9a authored by Alejandro Rodríguez's avatar Alejandro Rodríguez
Browse files

Send Gitaly payload for git-upload-archive SSH commands

parent 22fc4863
No related branches found
No related tags found
No related merge requests found
6.0.4
7.1.0
Loading
Loading
@@ -109,7 +109,7 @@ module API
 
# Return the Gitaly Address if it is enabled
def gitaly_payload(action)
return unless %w[git-receive-pack git-upload-pack].include?(action)
return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
 
{
repository: repository.gitaly_repository,
Loading
Loading
Loading
Loading
@@ -447,6 +447,12 @@ describe API::Internal do
 
expect(response).to have_gitlab_http_status(200)
expect(json_response["status"]).to be_truthy
expect(json_response["gitaly"]).not_to be_nil
expect(json_response["gitaly"]["repository"]).not_to be_nil
expect(json_response["gitaly"]["repository"]["storage_name"]).to eq(project.repository.gitaly_repository.storage_name)
expect(json_response["gitaly"]["repository"]["relative_path"]).to eq(project.repository.gitaly_repository.relative_path)
expect(json_response["gitaly"]["address"]).to eq(Gitlab::GitalyClient.address(project.repository_storage))
expect(json_response["gitaly"]["token"]).to eq(Gitlab::GitalyClient.token(project.repository_storage))
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment