diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/graphql/types | |
parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/types')
-rw-r--r-- | app/graphql/types/ci/pipeline_type.rb | 2 | ||||
-rw-r--r-- | app/graphql/types/merge_request_type.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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' |