diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-31 10:52:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-31 10:52:27 +0000 |
| commit | ce65e0dba60ef019710610e0baf0c426dd577311 (patch) | |
| tree | 92c5a464a03fce9bb9b4b433e1f918205f6f7010 | |
| parent | 228926daee799c95e752a3c284c860e5bc60e528 (diff) | |
| parent | 870a8bbbdd7456af03b5b4159c6dee4941edb759 (diff) | |
| download | gitlab-ce-ce65e0dba60ef019710610e0baf0c426dd577311.tar.gz | |
Merge branch 'enable-gitaly-receive-pack' into 'master'
Allow PostReceivePack to be enabled with Gitaly
Closes gitaly#246
See merge request !11809
| -rw-r--r-- | lib/gitlab/workhorse.rb | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 2 |
2 files changed, 2 insertions, 3 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' diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index fdbb55fc874..b1999409170 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -244,7 +244,7 @@ describe Gitlab::Workhorse, lib: true do context "when git_receive_pack action is passed" do let(:action) { 'git_receive_pack' } - it { expect(subject).not_to include(gitaly_params) } + it { expect(subject).to include(gitaly_params) } end context "when info_refs action is passed" do |