diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:28 +0300 |
commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/graphql | |
parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql')
-rw-r--r-- | app/graphql/mutations/issues/base.rb | 2 | ||||
-rw-r--r-- | app/graphql/mutations/merge_requests/base.rb | 2 | ||||
-rw-r--r-- | app/graphql/resolvers/issues_resolver.rb | 4 | ||||
-rw-r--r-- | app/graphql/resolvers/merge_requests_resolver.rb | 4 | ||||
-rw-r--r-- | app/graphql/types/ci/pipeline_type.rb | 2 | ||||
-rw-r--r-- | app/graphql/types/merge_request_type.rb | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/app/graphql/mutations/issues/base.rb b/app/graphql/mutations/issues/base.rb index 7c545c3eb00..9ec9ff812c2 100644 --- a/app/graphql/mutations/issues/base.rb +++ b/app/graphql/mutations/issues/base.rb @@ -9,7 +9,7 @@ module Mutations required: true, description: "The project the issue to mutate is in" - argument :iid, GraphQL::STRING_TYPE, + argument :iid, GraphQL::ID_TYPE, required: true, description: "The iid of the issue to mutate" diff --git a/app/graphql/mutations/merge_requests/base.rb b/app/graphql/mutations/merge_requests/base.rb index 96228855ace..5828146d82a 100644 --- a/app/graphql/mutations/merge_requests/base.rb +++ b/app/graphql/mutations/merge_requests/base.rb @@ -9,7 +9,7 @@ module Mutations required: true, description: "The project the merge request to mutate is in" - argument :iid, GraphQL::STRING_TYPE, + argument :iid, GraphQL::ID_TYPE, required: true, description: "The iid of the merge request to mutate" diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb index ae77af32b5b..59d37b0bc6f 100644 --- a/app/graphql/resolvers/issues_resolver.rb +++ b/app/graphql/resolvers/issues_resolver.rb @@ -2,11 +2,11 @@ module Resolvers class IssuesResolver < BaseResolver - argument :iid, GraphQL::STRING_TYPE, + argument :iid, GraphQL::ID_TYPE, required: false, description: 'IID of the issue. For example, "1"' - argument :iids, [GraphQL::STRING_TYPE], + argument :iids, [GraphQL::ID_TYPE], required: false, description: 'List of IIDs of issues. For example, [1, 2]' argument :state, Types::IssuableStateEnum, diff --git a/app/graphql/resolvers/merge_requests_resolver.rb b/app/graphql/resolvers/merge_requests_resolver.rb index 1740d614b69..96f1a4ffabd 100644 --- a/app/graphql/resolvers/merge_requests_resolver.rb +++ b/app/graphql/resolvers/merge_requests_resolver.rb @@ -2,11 +2,11 @@ module Resolvers class MergeRequestsResolver < BaseResolver - argument :iid, GraphQL::STRING_TYPE, + argument :iid, GraphQL::ID_TYPE, required: false, description: 'The IID of the merge request, e.g., "1"' - argument :iids, [GraphQL::STRING_TYPE], + argument :iids, [GraphQL::ID_TYPE], required: false, description: 'The list of IIDs of issues, e.g., [1, 2]' diff --git a/app/graphql/types/ci/pipeline_type.rb b/app/graphql/types/ci/pipeline_type.rb index d77b2a2ba32..ba0103781ff 100644 --- a/app/graphql/types/ci/pipeline_type.rb +++ b/app/graphql/types/ci/pipeline_type.rb @@ -11,7 +11,7 @@ module Types field :id, GraphQL::ID_TYPE, null: false, description: 'ID of the pipeline' - field :iid, GraphQL::STRING_TYPE, null: false, + field :iid, GraphQL::ID_TYPE, null: false, description: 'Internal ID of the pipeline' field :sha, GraphQL::STRING_TYPE, null: false, diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb index 0da95b367d8..ba4bdc6a443 100644 --- a/app/graphql/types/merge_request_type.rb +++ b/app/graphql/types/merge_request_type.rb @@ -14,7 +14,7 @@ module Types field :id, GraphQL::ID_TYPE, null: false, description: 'ID of the merge request' - field :iid, GraphQL::STRING_TYPE, null: false, + field :iid, GraphQL::ID_TYPE, null: false, description: 'Internal ID of the merge request' field :title, GraphQL::STRING_TYPE, null: false, description: 'Title of the merge request' |