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

GITLAB_SHELL_VERSION

-6.0.4
+7.1.0

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,

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