Commit 96dba2ca authored by Sean McGivern's avatar Sean McGivern

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

Enable gitaly_post_upload_pack by default

See merge request !13078
parents 1a2b92f7 a78306e7
---
title: Enable gitaly_post_upload_pack by default
merge_request: 13078
author:
...@@ -35,7 +35,10 @@ module Gitlab ...@@ -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
......
...@@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment