summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-04 14:52:38 +0000
committerRobert Speicher <robert@gitlab.com>2017-04-04 14:52:38 +0000
commit1d96b01f3f9a4a1acf278112acedef1f630858a4 (patch)
tree368e9ddb4e4954d6b5dea0717082b709da39d3a9 /lib
parent3301f4a22b685975d664ea8abdd7c43b3e929e5a (diff)
parentd56e4222573c791771b99bfbd655eecef301cf54 (diff)
downloadgitlab-ce-1d96b01f3f9a4a1acf278112acedef1f630858a4.tar.gz
Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master'
Disable support for Gitaly PostReceivePack See merge request !10444
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/workhorse.rb3
1 files changed, 2 insertions, 1 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'