From 9dc93a4519d9d5d7be48ff274127136236a3adb3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 20 Apr 2021 23:50:22 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-11-stable-ee

---
 app/graphql/resolvers/merge_requests_resolver.rb | 39 +++++++++++++++++-------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'app/graphql/resolvers/merge_requests_resolver.rb')

diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb
index ecbdaaa3f55..a9eea4ae4b8 100644
--- a/app/graphql/resolvers/merge_requests_resolver.rb
+++ b/app/graphql/resolvers/merge_requests_resolver.rb
@@ -3,42 +3,49 @@
 module Resolvers
   class MergeRequestsResolver < BaseResolver
     include ResolvesMergeRequests
+    extend ::Gitlab::Graphql::NegatableArguments
 
     type ::Types::MergeRequestType.connection_type, null: true
 
-    alias_method :project, :synchronized_object
+    alias_method :project, :object
 
     def self.accept_assignee
       argument :assignee_username, GraphQL::STRING_TYPE,
-             required: false,
-             description: 'Username of the assignee.'
+               required: false,
+               description: 'Username of the assignee.'
     end
 
     def self.accept_author
       argument :author_username, GraphQL::STRING_TYPE,
-             required: false,
-             description: 'Username of the author.'
+               required: false,
+               description: 'Username of the author.'
     end
 
     def self.accept_reviewer
       argument :reviewer_username, GraphQL::STRING_TYPE,
-             required: false,
-             description: 'Username of the reviewer.'
+               required: false,
+               description: 'Username of the reviewer.'
     end
 
     argument :iids, [GraphQL::STRING_TYPE],
-              required: false,
-              description: 'Array of IIDs of merge requests, for example `[1, 2]`.'
+             required: false,
+             description: 'Array of IIDs of merge requests, for example `[1, 2]`.'
 
     argument :source_branches, [GraphQL::STRING_TYPE],
              required: false,
              as: :source_branch,
-             description: 'Array of source branch names. All resolved merge requests will have one of these branches as their source.'
+             description: <<~DESC
+               Array of source branch names.
+               All resolved merge requests will have one of these branches as their source.
+             DESC
 
     argument :target_branches, [GraphQL::STRING_TYPE],
              required: false,
              as: :target_branch,
-             description: 'Array of target branch names. All resolved merge requests will have one of these branches as their target.'
+             description: <<~DESC
+               Array of target branch names.
+               All resolved merge requests will have one of these branches as their target.
+             DESC
 
     argument :state, ::Types::MergeRequestStateEnum,
              required: false,
@@ -62,6 +69,16 @@ module Resolvers
              required: false,
              default_value: :created_desc
 
+    negated do
+      argument :labels, [GraphQL::STRING_TYPE],
+               required: false,
+               as: :label_name,
+               description: 'Array of label names. All resolved merge requests will not have these labels.'
+      argument :milestone_title, GraphQL::STRING_TYPE,
+               required: false,
+               description: 'Title of the milestone.'
+    end
+
     def self.single
       ::Resolvers::MergeRequestResolver
     end
-- 
cgit v1.2.3