diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-31 13:52:27 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-31 13:52:27 +0300 |
| commit | ce65e0dba60ef019710610e0baf0c426dd577311 (patch) | |
| tree | 92c5a464a03fce9bb9b4b433e1f918205f6f7010 /lib | |
| parent | 228926daee799c95e752a3c284c860e5bc60e528 (diff) | |
| parent | 870a8bbbdd7456af03b5b4159c6dee4941edb759 (diff) | |
Merge branch 'enable-gitaly-receive-pack' into 'master'
Allow PostReceivePack to be enabled with Gitaly
Closes gitaly#246
See merge request !11809
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index fe37e4da94f..18d8b4f4744 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -31,8 +31,7 @@ module Gitlab feature_enabled = case action.to_s when 'git_receive_pack' - # Disabled for now, see https://gitlab.com/gitlab-org/gitaly/issues/172 - false + Gitlab::GitalyClient.feature_enabled?(:post_receive_pack) when 'git_upload_pack' Gitlab::GitalyClient.feature_enabled?(:post_upload_pack) when 'info_refs' |