diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 10:39:15 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 10:39:15 +0000 |
| commit | 96dba2ca17878eda915e13a7a00aad5831e03c36 (patch) | |
| tree | 9a6f355898fefd3fc28d1001baf77a74364470c2 | |
| parent | 1a2b92f7f6fd3a533654aae22c4e2b9e5db567ee (diff) | |
| parent | a78306e7fa0e815a5586a81ee9c2fcf095793de4 (diff) | |
| download | gitlab-ce-96dba2ca17878eda915e13a7a00aad5831e03c36.tar.gz | |
Merge branch 'post-upload-pack-opt-out' into 'master'
Enable gitaly_post_upload_pack by default
See merge request !13078
| -rw-r--r-- | changelogs/unreleased/post-upload-pack-opt-out.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/changelogs/unreleased/post-upload-pack-opt-out.yml b/changelogs/unreleased/post-upload-pack-opt-out.yml new file mode 100644 index 00000000000..302a99795a0 --- /dev/null +++ b/changelogs/unreleased/post-upload-pack-opt-out.yml @@ -0,0 +1,4 @@ +--- +title: Enable gitaly_post_upload_pack by default +merge_request: 13078 +author: diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 5dd8a38fea2..3f25e463412 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -35,7 +35,10 @@ module Gitlab when 'git_receive_pack' Gitlab::GitalyClient.feature_enabled?(:post_receive_pack) when 'git_upload_pack' - Gitlab::GitalyClient.feature_enabled?(:post_upload_pack) + Gitlab::GitalyClient.feature_enabled?( + :post_upload_pack, + status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT + ) when 'info_refs' true else diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index 7b39441e76e..6ca1edb01b9 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do 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) + status_opt_out = Gitlab::GitalyClient::MigrationStatus::OPT_OUT + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag, status: status_opt_out).and_return(false) expect(subject).not_to include(gitaly_params) end |