Commit 1d96b01f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master'

Disable support for Gitaly PostReceivePack

See merge request !10444
parents 3301f4a2 d56e4222
...@@ -35,7 +35,8 @@ module Gitlab ...@@ -35,7 +35,8 @@ module Gitlab
feature_enabled = case action.to_s feature_enabled = case action.to_s
when 'git_receive_pack' when 'git_receive_pack'
Gitlab::GitalyClient.feature_enabled?(:post_receive_pack) # Disabled for now, see https://gitlab.com/gitlab-org/gitaly/issues/172
false
when 'git_upload_pack' when 'git_upload_pack'
Gitlab::GitalyClient.feature_enabled?(:post_upload_pack) Gitlab::GitalyClient.feature_enabled?(:post_upload_pack)
when 'info_refs' when 'info_refs'
......
...@@ -207,12 +207,9 @@ describe Gitlab::Workhorse, lib: true do ...@@ -207,12 +207,9 @@ describe Gitlab::Workhorse, lib: true do
expect(subject).to include(repo_param) expect(subject).to include(repo_param)
end end
{ context "when git_upload_pack action is passed" do
git_receive_pack: :post_receive_pack, let(:action) { 'git_upload_pack' }
git_upload_pack: :post_upload_pack let(:feature_flag) { :post_upload_pack }
}.each do |action_name, feature_flag|
context "when #{action_name} action is passed" do
let(:action) { action_name }
context 'when action is enabled by feature flag' do context 'when action is enabled by feature flag' do
it 'includes Gitaly params in the returned value' do it 'includes Gitaly params in the returned value' do
...@@ -230,6 +227,11 @@ describe Gitlab::Workhorse, lib: true do ...@@ -230,6 +227,11 @@ describe Gitlab::Workhorse, lib: true do
end end
end end
end end
context "when git_receive_pack action is passed" do
let(:action) { 'git_receive_pack' }
it { expect(subject).not_to include(gitaly_params) }
end end
context "when info_refs action is passed" do context "when info_refs action is passed" do
......
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