Merge branch 'post-upload-pack-opt-out' into 'master'

Enable gitaly_post_upload_pack by default

See merge request !13078
This commit is contained in:
Sean McGivern 2017-07-26 10:39:15 +00:00
commit 96dba2ca17
3 changed files with 10 additions and 2 deletions

View file

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

View file

@ -35,7 +35,10 @@ module Gitlab
when 'git_receive_pack'
Gitlab::GitalyClient.feature_enabled?(:post_receive_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'
true
else

View file

@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do
context 'when action is not enabled by feature flag' 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)
end