diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-21 15:45:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-21 15:45:53 +0000 |
| commit | 40c338a4bbcfbcb1da0a54acfdf730f6bae6763f (patch) | |
| tree | 1c7bbf51921edf2729b46cda5332f200261b82a1 | |
| parent | baaef4a6a9772768093a20cfb50836305872b5cf (diff) | |
| parent | cf1a1e9ac102bd14e49ca8d54494f52765cbf6a4 (diff) | |
| download | gitlab-ce-40c338a4bbcfbcb1da0a54acfdf730f6bae6763f.tar.gz | |
Merge branch 'gitaly-upload-archive' into 'master'
Send Gitaly payload for git-upload-archive SSH commands
Closes gitaly#1092
See merge request gitlab-org/gitlab-ce!17903
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 1aa5e414fd3..a3fcc7121bb 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -6.0.4 +7.1.0 diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index 4b564cfdef2..14648588dfd 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -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, diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index ca0aac87ba9..3cb90a1b8ef 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -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 |