Skip to content
Snippets Groups Projects
Commit 06afa5a3 authored by Sean McGivern's avatar Sean McGivern
Browse files

Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"

This reverts merge request !18002
parent ef92eb6b
No related branches found
No related tags found
No related merge requests found
---
title: Make all workhorse gitaly calls opt-out
merge_request: 18002
author:
type: other
Loading
Loading
@@ -42,7 +42,7 @@ module Gitlab
end
 
def send_git_blob(repository, blob)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show)
{
'GitalyServer' => gitaly_server_hash(repository),
'GetBlobRequest' => {
Loading
Loading
@@ -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, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive)
params.merge!(
'GitalyServer' => gitaly_server_hash(repository),
'GitalyRepository' => repository.gitaly_repository.to_h
Loading
Loading
@@ -87,7 +87,7 @@ module Gitlab
end
 
def send_git_diff(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff)
{
'GitalyServer' => gitaly_server_hash(repository),
'RawDiffRequest' => Gitaly::RawDiffRequest.new(
Loading
Loading
@@ -105,7 +105,7 @@ module Gitlab
end
 
def send_git_patch(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, Gitlab::GitalyClient::MigrationStatus::OPT_OUT)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch)
{
'GitalyServer' => gitaly_server_hash(repository),
'RawPatchRequest' => Gitaly::RawPatchRequest.new(
Loading
Loading
Loading
Loading
@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
end
end
 
context 'when Gitaly workhorse_archive feature is disabled', :disable_gitaly do
context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
 
Loading
Loading
@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
end
end
 
context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do
context 'when Gitaly workhorse_send_git_patch feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
 
Loading
Loading
@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
end
end
 
context 'when Gitaly workhorse_send_git_diff feature is disabled', :disable_gitaly do
context 'when Gitaly workhorse_send_git_diff feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
 
Loading
Loading
@@ -452,7 +452,7 @@ describe Gitlab::Workhorse do
end
end
 
context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do
context 'when Gitaly workhorse_raw_show feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject)
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment