Skip to content

G
gitlab-ce
Commit 40e25ed6 authored by Eugenia Grieff's avatar Eugenia Grieff
Browse files
Options

Revert backend changes 

- Revert changes in
gitlab.com/gitlab-org/gitlab/-/merge_requests/26171
- Type in iid arguments reverted to STRING_TYPE
parent dcb0e69f
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
app/graphql/mutations/merge_requests/base.rb
View file @ 40e25ed6
......@@ -9,7 +9,7 @@ module Mutations
required: true,
description: "The project the merge request to mutate is in"
argument :iid, GraphQL::ID_TYPE,
argument :iid, GraphQL::STRING_TYPE,
required: true,
description: "The iid of the merge request to mutate"
......
app/graphql/resolvers/issues_resolver.rb
View file @ 40e25ed6
......@@ -2,11 +2,11 @@
module Resolvers
class IssuesResolver < BaseResolver
argument :iid, GraphQL::ID_TYPE,
argument :iid, GraphQL::STRING_TYPE,
required: false,
description: 'IID of the issue. For example, "1"'
argument :iids, [GraphQL::ID_TYPE],
argument :iids, [GraphQL::STRING_TYPE],
required: false,
description: 'List of IIDs of issues. For example, [1, 2]'
argument :state, Types::IssuableStateEnum,
......
app/graphql/resolvers/merge_requests_resolver.rb
View file @ 40e25ed6
......@@ -2,11 +2,11 @@
module Resolvers
class MergeRequestsResolver < BaseResolver
argument :iid, GraphQL::ID_TYPE,
argument :iid, GraphQL::STRING_TYPE,
required: false,
description: 'The IID of the merge request, e.g., "1"'
argument :iids, [GraphQL::ID_TYPE],
argument :iids, [GraphQL::STRING_TYPE],
required: false,
description: 'The list of IIDs of issues, e.g., [1, 2]'
......
app/graphql/types/ci/pipeline_type.rb
View file @ 40e25ed6
......@@ -11,7 +11,7 @@ module Types
field :id, GraphQL::ID_TYPE, null: false,
description: 'ID of the pipeline'
field :iid, GraphQL::ID_TYPE, null: false,
field :iid, GraphQL::STRING_TYPE, null: false,
description: 'Internal ID of the pipeline'
field :sha, GraphQL::STRING_TYPE, null: false,
......
app/graphql/types/merge_request_type.rb
View file @ 40e25ed6
......@@ -14,7 +14,7 @@ module Types
field :id, GraphQL::ID_TYPE, null: false,
description: 'ID of the merge request'
field :iid, GraphQL::ID_TYPE, null: false,
field :iid, GraphQL::STRING_TYPE, null: false,
description: 'Internal ID of the merge request'
field :title, GraphQL::STRING_TYPE, null: false,
description: 'Title of the merge request'
......
doc/api/graphql/reference/gitlab_schema.graphql
View file @ 40e25ed6
......@@ -4150,7 +4150,7 @@ type MergeRequest implements Noteable {
"""
Internal ID of the merge request
"""
iid: ID!
iid: String!
"""
Commit SHA of the merge request if merge is in progress
......@@ -4550,7 +4550,7 @@ input MergeRequestSetAssigneesInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
The operation to perform. Defaults to REPLACE.
......@@ -4595,7 +4595,7 @@ input MergeRequestSetLabelsInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
The Label IDs to set. Replaces existing labels by default.
......@@ -4645,7 +4645,7 @@ input MergeRequestSetLockedInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
Whether or not to lock the merge request.
......@@ -4690,7 +4690,7 @@ input MergeRequestSetMilestoneInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
The milestone to assign to the merge request.
......@@ -4735,7 +4735,7 @@ input MergeRequestSetSubscriptionInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
The project the merge request to mutate is in
......@@ -4780,7 +4780,7 @@ input MergeRequestSetWipInput {
"""
The iid of the merge request to mutate
"""
iid: ID!
iid: String!
"""
The project the merge request to mutate is in
......@@ -5351,7 +5351,7 @@ type Pipeline {
"""
Internal ID of the pipeline
"""
iid: ID!
iid: String!
"""
SHA of the pipeline's commit
......@@ -5629,12 +5629,12 @@ type Project {
"""
IID of the issue. For example, "1"
"""
iid: ID
iid: String
"""
List of IIDs of issues. For example, [1, 2]
"""
iids: [ID!]
iids: [String!]
"""
Labels applied to this issue
......@@ -5724,12 +5724,12 @@ type Project {
"""
IID of the issue. For example, "1"
"""
iid: ID
iid: String
"""
List of IIDs of issues. For example, [1, 2]
"""
iids: [ID!]
iids: [String!]
"""
Labels applied to this issue
......@@ -5799,12 +5799,12 @@ type Project {
"""
The IID of the merge request, e.g., "1"
"""
iid: ID
iid: String
"""
The list of IIDs of issues, e.g., [1, 2]
"""
iids: [ID!]
iids: [String!]
): MergeRequest
"""
......@@ -5829,12 +5829,12 @@ type Project {
"""
The IID of the merge request, e.g., "1"
"""
iid: ID
iid: String
"""
The list of IIDs of issues, e.g., [1, 2]
"""
iids: [ID!]
iids: [String!]
"""
Returns the last _n_ elements from the list.
......
doc/api/graphql/reference/gitlab_schema.json
View file @ 40e25ed6
......@@ -11861,7 +11861,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13024,7 +13024,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13172,7 +13172,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13320,7 +13320,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13450,7 +13450,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13576,7 +13576,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -13706,7 +13706,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -16283,7 +16283,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
},
......@@ -17021,7 +17021,7 @@
"description": "IID of the issue. For example, \"1\"",
"type": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
},
"defaultValue": null
......@@ -17037,7 +17037,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
}
......@@ -17200,7 +17200,7 @@
"description": "IID of the issue. For example, \"1\"",
"type": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
},
"defaultValue": null
......@@ -17216,7 +17216,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
}
......@@ -17475,7 +17475,7 @@
"description": "The IID of the merge request, e.g., \"1\"",
"type": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
},
"defaultValue": null
......@@ -17491,7 +17491,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
}
......@@ -17516,7 +17516,7 @@
"description": "The IID of the merge request, e.g., \"1\"",
"type": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
},
"defaultValue": null
......@@ -17532,7 +17532,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "ID",
"name": "String",
"ofType": null
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7