From 6ba7c824e92d68c6ae25f64bda5ab213ad9c9a58 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 16 Nov 2023 18:07:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/packages/debian/extract_metadata_service.rb | 4 +--- app/services/packages/helm/extract_file_metadata_service.rb | 4 +--- app/services/packages/nuget/process_package_file_service.rb | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'app/services/packages') diff --git a/app/services/packages/debian/extract_metadata_service.rb b/app/services/packages/debian/extract_metadata_service.rb index cc9defd2e73..91a4a0d67c8 100644 --- a/app/services/packages/debian/extract_metadata_service.rb +++ b/app/services/packages/debian/extract_metadata_service.rb @@ -26,9 +26,7 @@ module Packages attr_reader :package_file def valid_package_file? - package_file && - package_file.package&.debian? && - package_file.file.size > 0 # rubocop:disable Style/ZeroLengthPredicate + package_file && package_file.package&.debian? && !package_file.file.empty_size? end def file_type_basic diff --git a/app/services/packages/helm/extract_file_metadata_service.rb b/app/services/packages/helm/extract_file_metadata_service.rb index 77efa65f1d1..5cd1acc57dd 100644 --- a/app/services/packages/helm/extract_file_metadata_service.rb +++ b/app/services/packages/helm/extract_file_metadata_service.rb @@ -24,9 +24,7 @@ module Packages private def valid_package_file? - @package_file && - @package_file.package&.helm? && - @package_file.file.size > 0 # rubocop:disable Style/ZeroLengthPredicate + @package_file && @package_file.package&.helm? && !@package_file.file.empty_size? end def metadata diff --git a/app/services/packages/nuget/process_package_file_service.rb b/app/services/packages/nuget/process_package_file_service.rb index 99b59bd3322..acec926dc48 100644 --- a/app/services/packages/nuget/process_package_file_service.rb +++ b/app/services/packages/nuget/process_package_file_service.rb @@ -22,9 +22,7 @@ module Packages attr_reader :package_file def valid_package_file? - package_file && - package_file.package&.nuget? && - package_file.file.size > 0 # rubocop:disable Style/ZeroLengthPredicate + package_file && package_file.package&.nuget? && !package_file.file.empty_size? end def with_zip_file(&block) -- cgit v1.2.3