From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- spec/lib/gitlab/workhorse_spec.rb | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'spec/lib/gitlab/workhorse_spec.rb') diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index d40ecc7e04e..09f90a3e5b6 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -60,37 +60,6 @@ RSpec.describe Gitlab::Workhorse do }.deep_stringify_keys) end - context 'when include_lfs_blobs_in_archive is disabled' do - before do - stub_feature_flags(include_lfs_blobs_in_archive: false) - end - - it 'sets include_lfs_blobs to false' do - key, command, params = decode_workhorse_header(subject) - - expect(key).to eq('Gitlab-Workhorse-Send-Data') - expect(command).to eq('git-archive') - expect(params).to eq({ - 'GitalyServer' => { - features: { 'gitaly-feature-enforce-requests-limits' => 'true' }, - address: Gitlab::GitalyClient.address(project.repository_storage), - token: Gitlab::GitalyClient.token(project.repository_storage) - }, - 'ArchivePath' => metadata['ArchivePath'], - 'GetArchiveRequest' => Base64.encode64( - Gitaly::GetArchiveRequest.new( - repository: repository.gitaly_repository, - commit_id: metadata['CommitId'], - prefix: metadata['ArchivePrefix'], - format: Gitaly::GetArchiveRequest::Format::ZIP, - path: path, - include_lfs_blobs: false - ).to_proto - ) - }.deep_stringify_keys) - end - end - context 'when archive caching is disabled' do let(:cache_disabled) { true } -- cgit v1.2.3