Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee

3 files changed, 8 insertions, 2 deletions

diff --git a/app/graphql/mutations/packages/destroy.rb b/app/graphql/mutations/packages/destroy.rb
index 979a54da6bd..81fa53fc116 100644
--- a/app/graphql/mutations/packages/destroy.rb
+++ b/app/graphql/mutations/packages/destroy.rb
@@ -15,7 +15,7 @@ module Mutations
       def resolve(id:)
         package = authorized_find!(id: id)
 
-        result = ::Packages::DestroyPackageService.new(container: package, current_user: current_user).execute
+        result = ::Packages::MarkPackageForDestructionService.new(container: package, current_user: current_user).execute
 
         errors = result.error? ? Array.wrap(result[:message]) : []
 
diff --git a/app/graphql/mutations/packages/destroy_file.rb b/app/graphql/mutations/packages/destroy_file.rb
index 35a486666d5..4aa33b3504c 100644
--- a/app/graphql/mutations/packages/destroy_file.rb
+++ b/app/graphql/mutations/packages/destroy_file.rb
@@ -15,7 +15,7 @@ module Mutations
       def resolve(id:)
         package_file = authorized_find!(id: id)
 
-        if package_file.destroy
+        if package_file.update(status: :pending_destruction)
           return { errors: [] }
         end
 
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index f4067552f55..d49244f6b65 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -438,6 +438,12 @@ module Types
       ::Security::CiConfiguration::SastParserService.new(object).configuration
     end
 
+    def service_desk_address
+      return unless Ability.allowed?(current_user, :admin_issue, project)
+
+      object.service_desk_address
+    end
+
     def tag_list
       object.topic_list
     end