From efbf661c4224d481c57d0346e26983a805e5ec93 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 24 Apr 2023 15:15:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/packages/generic/create_package_file_service.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/services/packages') diff --git a/app/services/packages/generic/create_package_file_service.rb b/app/services/packages/generic/create_package_file_service.rb index 78c97000654..09e3fb4a825 100644 --- a/app/services/packages/generic/create_package_file_service.rb +++ b/app/services/packages/generic/create_package_file_service.rb @@ -47,7 +47,11 @@ module Packages end def target_file_is_duplicate?(package) - package.package_files.with_file_name(params[:file_name]).exists? + package + .package_files + .with_file_name(params[:file_name]) + .not_pending_destruction + .exists? end end end -- cgit v1.2.3