Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/app/graphql/types/permission_types/base_permission_type.rb b/app/graphql/types/permission_types/base_permission_type.rb
index 07e6e7a55d6..0192af25d0f 100644
--- a/app/graphql/types/permission_types/base_permission_type.rb
+++ b/app/graphql/types/permission_types/base_permission_type.rb
@@ -11,20 +11,20 @@ module Types
         abilities.each { |ability| ability_field(ability) }
       end
 
-      def self.ability_field(ability, **kword_args)
+      def self.ability_field(ability, **kword_args, &block)
         define_field_resolver_method(ability) unless resolving_keywords?(kword_args)
 
-        permission_field(ability, **kword_args)
+        permission_field(ability, **kword_args, &block)
       end
 
-      def self.permission_field(name, **kword_args)
+      def self.permission_field(name, **kword_args, &block)
         kword_args = kword_args.reverse_merge(
           name: name,
           type: GraphQL::Types::Boolean,
           description: "Indicates the user can perform `#{name}` on this resource",
           null: false)
 
-        field(**kword_args) # rubocop:disable Graphql/Descriptions
+        field(**kword_args, &block) # rubocop:disable Graphql/Descriptions
       end
 
       def self.define_field_resolver_method(ability)