summaryrefslogtreecommitdiff
path: root/app/graphql/resolvers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 21:09:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 21:09:46 +0000
commit6867eff1f997a881cd3ea64109f7ba2d4b42fde4 (patch)
treea0d4b0ced920ff41311e578b406ed9a7136e8f42 /app/graphql/resolvers
parent3290d46655f07d7ae3dca788d6df9f326972ffd8 (diff)
downloadgitlab-ce-6867eff1f997a881cd3ea64109f7ba2d4b42fde4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/resolvers')
-rw-r--r--app/graphql/resolvers/merge_requests_resolver.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb
index 406a1fac05c..cda27890d6b 100644
--- a/app/graphql/resolvers/merge_requests_resolver.rb
+++ b/app/graphql/resolvers/merge_requests_resolver.rb
@@ -4,11 +4,11 @@ module Resolvers
class MergeRequestsResolver < BaseResolver
argument :iid, GraphQL::STRING_TYPE,
required: false,
- description: 'The IID of the merge request, e.g., "1"'
+ description: 'IID of the merge request, for example `1`'
argument :iids, [GraphQL::STRING_TYPE],
required: false,
- description: 'The list of IIDs of issues, e.g., [1, 2]'
+ description: 'Array of IIDs of merge requests, for example `[1, 2]`'
type Types::MergeRequestType, null: true