diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-29 09:47:44 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-29 09:47:44 +0000 |
| commit | 60da38a1a75b17a57a1bc071993b74e9862bbb67 (patch) | |
| tree | 1189ca065a4b53e0c26d0f13b5b6126a636a656c /lib/api | |
| parent | e74ef3acea2c8f6fdb81524b78970a5fc57f845c (diff) | |
| parent | a402056472aa9d8472b9ef92e70128e472b2b030 (diff) | |
| download | gitlab-ce-60da38a1a75b17a57a1bc071993b74e9862bbb67.tar.gz | |
Merge branch 'gitaly-ssh-upload-pack-opt-out' into 'master'
SSHUploadPack over Gitaly is now OptOut
Closes gitaly#730
See merge request gitlab-org/gitlab-ce!15623
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/helpers/internal_helpers.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index 4b3c473b0bb..d6dea4c30e3 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -2,8 +2,8 @@ module API module Helpers module InternalHelpers SSH_GITALY_FEATURES = { - 'git-receive-pack' => :ssh_receive_pack, - 'git-upload-pack' => :ssh_upload_pack + 'git-receive-pack' => [:ssh_receive_pack, Gitlab::GitalyClient::MigrationStatus::OPT_IN], + 'git-upload-pack' => [:ssh_upload_pack, Gitlab::GitalyClient::MigrationStatus::OPT_OUT] }.freeze def wiki? @@ -102,8 +102,8 @@ module API # Return the Gitaly Address if it is enabled def gitaly_payload(action) - feature = SSH_GITALY_FEATURES[action] - return unless feature && Gitlab::GitalyClient.feature_enabled?(feature) + feature, status = SSH_GITALY_FEATURES[action] + return unless feature && Gitlab::GitalyClient.feature_enabled?(feature, status: status) { repository: repository.gitaly_repository, |