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

Disable support for Gitaly PostReceivePack

See merge request !10444

2 files changed, 22 insertions, 19 deletions

diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index d0637f8b394..09c3bd8fc9e 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -35,7 +35,8 @@ module Gitlab
 
           feature_enabled = case action.to_s
                             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'
                               Gitlab::GitalyClient.feature_enabled?(:post_upload_pack)
                             when 'info_refs'
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 3bd2a3238fe..a5b7d9ad35f 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -207,31 +207,33 @@ describe Gitlab::Workhorse, lib: true do
         expect(subject).to include(repo_param)
       end
 
-      {
-        git_receive_pack: :post_receive_pack,
-        git_upload_pack: :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
-            it 'includes Gitaly params in the returned value' do
-              allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(true)
-
-              expect(subject).to include(gitaly_params)
-            end
+      context "when git_upload_pack action is passed" do
+        let(:action) { 'git_upload_pack' }
+        let(:feature_flag) { :post_upload_pack }
+
+        context 'when action is enabled by feature flag' do
+          it 'includes Gitaly params in the returned value' do
+            allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(true)
+
+            expect(subject).to include(gitaly_params)
           end
+        end
 
-          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)
+        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)
 
-              expect(subject).not_to include(gitaly_params)
-            end
+            expect(subject).not_to include(gitaly_params)
           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
+
       context "when info_refs action is passed" do
         let(:action) { 'info_refs' }