diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 18:15:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 18:15:38 +0300 |
commit | efbf661c4224d481c57d0346e26983a805e5ec93 (patch) | |
tree | 4736f287350884cb49d84a09c52c8c2e1b851080 /app/services/packages | |
parent | 4720346c2e10e1ff62a20b39dfc9866eb88858e6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/packages')
-rw-r--r-- | app/services/packages/generic/create_package_file_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |