Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 1 deletions

diff --git a/app/graphql/types/packages/package_base_type.rb b/app/graphql/types/packages/package_base_type.rb
index aa580d48709..5102e4ebcd5 100644
--- a/app/graphql/types/packages/package_base_type.rb
+++ b/app/graphql/types/packages/package_base_type.rb
@@ -10,11 +10,19 @@ module Types
 
       authorize :read_package
 
+      expose_permissions Types::PermissionTypes::Package
+
       field :id, ::Types::GlobalIDType[::Packages::Package], null: false, description: 'ID of the package.'
 
       field :_links, Types::Packages::PackageLinksType, null: false, method: :itself,
                                                         description: 'Map of links to perform actions on the package.'
-      field :can_destroy, GraphQL::Types::Boolean, null: false, description: 'Whether the user can destroy the package.'
+      field :can_destroy, GraphQL::Types::Boolean,
+        null: false,
+        deprecated: {
+          reason: 'Superseded by `user_permissions` field. See `Types::PermissionTypes::Package` type',
+          milestone: '16.6'
+        },
+        description: 'Whether the user can destroy the package.'
       field :created_at, Types::TimeType, null: false, description: 'Date of creation.'
       field :metadata, Types::Packages::MetadataType,
         null: true,
diff --git a/app/graphql/types/permission_types/package.rb b/app/graphql/types/permission_types/package.rb
new file mode 100644
index 00000000000..debde3a1a8e
--- /dev/null
+++ b/app/graphql/types/permission_types/package.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Types
+  module PermissionTypes
+    class Package < BasePermissionType
+      graphql_name 'PackagePermissions'
+
+      ability_field :destroy_package,
+        description: 'If `true`, the user can perform `destroy_package` on this resource'
+    end
+  end
+end