diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-11-28 11:17:57 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-11-29 08:21:41 +0100 |
| commit | a402056472aa9d8472b9ef92e70128e472b2b030 (patch) | |
| tree | f97f5f9aca3cbc57a64f3ba553965d0bbf0ff81a /lib | |
| parent | 8ab0fceeef146831336b82c649dfae433b770271 (diff) | |
| download | gitlab-ce-a402056472aa9d8472b9ef92e70128e472b2b030.tar.gz | |
SSHUploadPack over Gitaly is now OptOutgitaly-ssh-upload-pack-opt-out
- Better gitaly-handling in /api/internal/allowed specs
Diffstat (limited to 'lib')
| -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, |