Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 5 insertions, 34 deletions

diff --git a/app/graphql/mutations/boards/create.rb b/app/graphql/mutations/boards/create.rb
index e381205242e..ebbd19930ec 100644
--- a/app/graphql/mutations/boards/create.rb
+++ b/app/graphql/mutations/boards/create.rb
@@ -3,8 +3,7 @@
 module Mutations
   module Boards
     class Create < ::Mutations::BaseMutation
-      include Mutations::ResolvesGroup
-      include ResolvesProject
+      include Mutations::ResolvesResourceParent
 
       graphql_name 'CreateBoard'
 
@@ -13,12 +12,6 @@ module Mutations
             null: true,
             description: 'The board after mutation.'
 
-      argument :project_path, GraphQL::ID_TYPE,
-               required: false,
-               description: 'The project full path the board is associated with.'
-      argument :group_path, GraphQL::ID_TYPE,
-               required: false,
-               description: 'The group full path the board is associated with.'
       argument :name,
                 GraphQL::STRING_TYPE,
                 required: false,
@@ -28,7 +21,7 @@ module Mutations
                 required: false,
                 description: 'The ID of the user to be assigned to the board.'
       argument :milestone_id,
-               GraphQL::ID_TYPE,
+               Types::GlobalIDType[Milestone],
                required: false,
                description: 'The ID of the milestone to be assigned to the board.'
       argument :weight,
@@ -36,17 +29,14 @@ module Mutations
                required: false,
                description: 'The weight of the board.'
       argument :label_ids,
-               [GraphQL::ID_TYPE],
+               [Types::GlobalIDType[Label]],
                required: false,
                description: 'The IDs of labels to be added to the board.'
 
       authorize :admin_board
 
       def resolve(args)
-        group_path = args.delete(:group_path)
-        project_path = args.delete(:project_path)
-
-        board_parent = authorized_find!(group_path: group_path, project_path: project_path)
+        board_parent = authorized_resource_parent_find!(args)
         response = ::Boards::CreateService.new(board_parent, current_user, args).execute
 
         {
@@ -54,25 +44,6 @@ module Mutations
           errors: response.errors
         }
       end
-
-      def ready?(**args)
-        if args.values_at(:project_path, :group_path).compact.blank?
-          raise Gitlab::Graphql::Errors::ArgumentError,
-                'group_path or project_path arguments are required'
-        end
-
-        super
-      end
-
-      private
-
-      def find_object(group_path: nil, project_path: nil)
-        if group_path
-          resolve_group(full_path: group_path)
-        else
-          resolve_project(full_path: project_path)
-        end
-      end
     end
   end
 end
diff --git a/app/graphql/mutations/boards/lists/update.rb b/app/graphql/mutations/boards/lists/update.rb
index 7efed3058b3..14502b5174f 100644
--- a/app/graphql/mutations/boards/lists/update.rb
+++ b/app/graphql/mutations/boards/lists/update.rb
@@ -6,7 +6,7 @@ module Mutations
       class Update < BaseMutation
         graphql_name 'UpdateBoardList'
 
-        argument :list_id, GraphQL::ID_TYPE,
+        argument :list_id, Types::GlobalIDType[List],
                   required: true,
                   loads: Types::BoardListType,
                   description: 'Global ID of the list.'