diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 14:00:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 14:00:13 +0000 |
| commit | e0a8447e06bbeb1c42598ed360fcb6ec0f7bb678 (patch) | |
| tree | 122c8f6ebbb0045c3bf3eae74dfa19e63bc8ac3e /lib | |
| parent | c23945a3fdd0bccd4277ac83a9beb158a5c57234 (diff) | |
| parent | 23936ff20db8b7680dd48cbc6b053720872b19f3 (diff) | |
| download | gitlab-ce-e0a8447e06bbeb1c42598ed360fcb6ec0f7bb678.tar.gz | |
Merge branch 'fix-workhorse-test' into 'master'
Make all workhorse gitaly calls opt-out, take 2
See merge request gitlab-org/gitlab-ce!18043
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index 5619130c263..a3012eca04c 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -42,7 +42,7 @@ module Gitlab end def send_git_blob(repository, blob) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) { 'GitalyServer' => gitaly_server_hash(repository), 'GetBlobRequest' => { @@ -70,7 +70,7 @@ module Gitlab params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format) raise "Repository or ref not found" if params.empty? - if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive) + if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) params.merge!( 'GitalyServer' => gitaly_server_hash(repository), 'GitalyRepository' => repository.gitaly_repository.to_h @@ -87,7 +87,7 @@ module Gitlab end def send_git_diff(repository, diff_refs) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) { 'GitalyServer' => gitaly_server_hash(repository), 'RawDiffRequest' => Gitaly::RawDiffRequest.new( @@ -105,7 +105,7 @@ module Gitlab end def send_git_patch(repository, diff_refs) - params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch) + params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) { 'GitalyServer' => gitaly_server_hash(repository), 'RawPatchRequest' => Gitaly::RawPatchRequest.new( |