kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Enable gitaly_post_upload_pack by default

This commit is contained in:
Jacob Vosmaer 2017-07-25 13:59:50 +02:00
parent c2c8d7ffab
commit a78306e7fa
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/unreleased/post-upload-pack-opt-out.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Enable gitaly_post_upload_pack by default
merge_request: 13078
author:

5
lib/gitlab/workhorse.rb
View File

@ -35,7 +35,10 @@ module Gitlab
when 'git_receive_pack' when 'git_receive_pack'
Gitlab::GitalyClient.feature_enabled?(:post_receive_pack) Gitlab::GitalyClient.feature_enabled?(:post_receive_pack)
when 'git_upload_pack' when 'git_upload_pack'
Gitlab::GitalyClient.feature_enabled?(:post_upload_pack) Gitlab::GitalyClient.feature_enabled?(
:post_upload_pack,
status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT
)
when 'info_refs' when 'info_refs'
true true
else else

3
spec/lib/gitlab/workhorse_spec.rb
View File

@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do
context 'when action is not enabled by feature flag' do context 'when action is not enabled by feature flag' do
it 'does not include Gitaly params in the returned value' do it 'does not include Gitaly params in the returned value' do
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(false) status_opt_out = Gitlab::GitalyClient::MigrationStatus::OPT_OUT
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag, status: status_opt_out).and_return(false)
expect(subject).not_to include(gitaly_params) expect(subject).not_to include(gitaly_params)
end end