Skip to content

G
gitlab-ce
Commit 45e3f2e5 authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Merge branch '208394-revert-iid-arguments-type' into 'master' 

Revert "Change iid argument to ID_TYPE for graphQL queries"

Closes #208394

See merge request gitlab-org/gitlab!27316
parents 48725c6b 5bc64433
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 59 deletions
app/assets/javascripts/mr_popover/queries/merge_request.query.graphql
View file @ 45e3f2e5
query mergeRequest($projectPath: ID!, $mergeRequestIID: ID!) { query mergeRequest($projectPath: ID!, $mergeRequestIID: String!) {
project(fullPath: $projectPath) { project(fullPath: $projectPath) {
mergeRequest(iid: $mergeRequestIID) { mergeRequest(iid: $mergeRequestIID) {
createdAt createdAt
......
app/assets/javascripts/sidebar/queries/sidebarDetails.query.graphql
View file @ 45e3f2e5
query ($fullPath: ID!, $iid: ID!) { query ($fullPath: ID!, $iid: String!) {
project (fullPath: $fullPath) { project (fullPath: $fullPath) {
issue (iid: $iid) { issue (iid: $iid) {
iid iid
......
app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql
View file @ 45e3f2e5
query ($fullPath: ID!, $iid: ID!) { query ($fullPath: ID!, $iid: String!) {
project (fullPath: $fullPath) { project (fullPath: $fullPath) {
issue (iid: $iid) { issue (iid: $iid) {
iid iid
......
app/graphql/mutations/issues/base.rb
View file @ 45e3f2e5
...@@ -9,7 +9,7 @@ module Mutations ...@@ -9,7 +9,7 @@ module Mutations
required: true, required: true,
description: "The project the issue to mutate is in" description: "The project the issue to mutate is in"
argument :iid, GraphQL::ID_TYPE, argument :iid, GraphQL::STRING_TYPE,
required: true, required: true,
description: "The iid of the issue to mutate" description: "The iid of the issue to mutate"
......
app/graphql/mutations/merge_requests/base.rb
View file @ 45e3f2e5
...@@ -9,7 +9,7 @@ module Mutations ...@@ -9,7 +9,7 @@ module Mutations
required: true, required: true,
description: "The project the merge request to mutate is in" description: "The project the merge request to mutate is in"
argument :iid, GraphQL::ID_TYPE, argument :iid, GraphQL::STRING_TYPE,
required: true, required: true,
description: "The iid of the merge request to mutate" description: "The iid of the merge request to mutate"
......
app/graphql/resolvers/issues_resolver.rb
View file @ 45e3f2e5
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
module Resolvers module Resolvers
class IssuesResolver < BaseResolver class IssuesResolver < BaseResolver
argument :iid, GraphQL::ID_TYPE, argument :iid, GraphQL::STRING_TYPE,
required: false, required: false,
description: 'IID of the issue. For example, "1"' description: 'IID of the issue. For example, "1"'
argument :iids, [GraphQL::ID_TYPE], argument :iids, [GraphQL::STRING_TYPE],
required: false, required: false,
description: 'List of IIDs of issues. For example, [1, 2]' description: 'List of IIDs of issues. For example, [1, 2]'
argument :state, Types::IssuableStateEnum, argument :state, Types::IssuableStateEnum,
......
app/graphql/resolvers/merge_requests_resolver.rb
View file @ 45e3f2e5
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
module Resolvers module Resolvers
class MergeRequestsResolver < BaseResolver class MergeRequestsResolver < BaseResolver
argument :iid, GraphQL::ID_TYPE, argument :iid, GraphQL::STRING_TYPE,
required: false, required: false,
description: 'The IID of the merge request, e.g., "1"' description: 'The IID of the merge request, e.g., "1"'
argument :iids, [GraphQL::ID_TYPE], argument :iids, [GraphQL::STRING_TYPE],
required: false, required: false,
description: 'The list of IIDs of issues, e.g., [1, 2]' description: 'The list of IIDs of issues, e.g., [1, 2]'
......
app/graphql/types/ci/pipeline_type.rb
View file @ 45e3f2e5
...@@ -11,7 +11,7 @@ module Types ...@@ -11,7 +11,7 @@ module Types
field :id, GraphQL::ID_TYPE, null: false, field :id, GraphQL::ID_TYPE, null: false,
description: 'ID of the pipeline' 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' description: 'Internal ID of the pipeline'
field :sha, GraphQL::STRING_TYPE, null: false, field :sha, GraphQL::STRING_TYPE, null: false,
......
app/graphql/types/merge_request_type.rb
View file @ 45e3f2e5
...@@ -14,7 +14,7 @@ module Types ...@@ -14,7 +14,7 @@ module Types
field :id, GraphQL::ID_TYPE, null: false, field :id, GraphQL::ID_TYPE, null: false,
description: 'ID of the merge request' 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' description: 'Internal ID of the merge request'
field :title, GraphQL::STRING_TYPE, null: false, field :title, GraphQL::STRING_TYPE, null: false,
description: 'Title of the merge request' description: 'Title of the merge request'
......
doc/api/graphql/reference/gitlab_schema.graphql
View file @ 45e3f2e5
...@@ -3757,7 +3757,7 @@ input IssueSetConfidentialInput { ...@@ -3757,7 +3757,7 @@ input IssueSetConfidentialInput {
""" """
The iid of the issue to mutate The iid of the issue to mutate
""" """
iid: ID! iid: String!
""" """
The project the issue to mutate is in The project the issue to mutate is in
...@@ -3802,7 +3802,7 @@ input IssueSetDueDateInput { ...@@ -3802,7 +3802,7 @@ input IssueSetDueDateInput {
""" """
The iid of the issue to mutate The iid of the issue to mutate
""" """
iid: ID! iid: String!
""" """
The project the issue to mutate is in The project the issue to mutate is in
...@@ -3842,7 +3842,7 @@ input IssueSetWeightInput { ...@@ -3842,7 +3842,7 @@ input IssueSetWeightInput {
""" """
The iid of the issue to mutate The iid of the issue to mutate
""" """
iid: ID! iid: String!
""" """
The project the issue to mutate is in The project the issue to mutate is in
...@@ -4150,7 +4150,7 @@ type MergeRequest implements Noteable { ...@@ -4150,7 +4150,7 @@ type MergeRequest implements Noteable {
""" """
Internal ID of the merge request Internal ID of the merge request
""" """
iid: ID! iid: String!
""" """
Commit SHA of the merge request if merge is in progress Commit SHA of the merge request if merge is in progress
...@@ -4550,7 +4550,7 @@ input MergeRequestSetAssigneesInput { ...@@ -4550,7 +4550,7 @@ input MergeRequestSetAssigneesInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
The operation to perform. Defaults to REPLACE. The operation to perform. Defaults to REPLACE.
...@@ -4595,7 +4595,7 @@ input MergeRequestSetLabelsInput { ...@@ -4595,7 +4595,7 @@ input MergeRequestSetLabelsInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
The Label IDs to set. Replaces existing labels by default. The Label IDs to set. Replaces existing labels by default.
...@@ -4645,7 +4645,7 @@ input MergeRequestSetLockedInput { ...@@ -4645,7 +4645,7 @@ input MergeRequestSetLockedInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
Whether or not to lock the merge request. Whether or not to lock the merge request.
...@@ -4690,7 +4690,7 @@ input MergeRequestSetMilestoneInput { ...@@ -4690,7 +4690,7 @@ input MergeRequestSetMilestoneInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
The milestone to assign to the merge request. The milestone to assign to the merge request.
...@@ -4735,7 +4735,7 @@ input MergeRequestSetSubscriptionInput { ...@@ -4735,7 +4735,7 @@ input MergeRequestSetSubscriptionInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
The project the merge request to mutate is in The project the merge request to mutate is in
...@@ -4780,7 +4780,7 @@ input MergeRequestSetWipInput { ...@@ -4780,7 +4780,7 @@ input MergeRequestSetWipInput {
""" """
The iid of the merge request to mutate The iid of the merge request to mutate
""" """
iid: ID! iid: String!
""" """
The project the merge request to mutate is in The project the merge request to mutate is in
...@@ -5351,7 +5351,7 @@ type Pipeline { ...@@ -5351,7 +5351,7 @@ type Pipeline {
""" """
Internal ID of the pipeline Internal ID of the pipeline
""" """
iid: ID! iid: String!
""" """
SHA of the pipeline's commit SHA of the pipeline's commit
...@@ -5629,12 +5629,12 @@ type Project { ...@@ -5629,12 +5629,12 @@ type Project {
""" """
IID of the issue. For example, "1" IID of the issue. For example, "1"
""" """
iid: ID iid: String
""" """
List of IIDs of issues. For example, [1, 2] List of IIDs of issues. For example, [1, 2]
""" """
iids: [ID!] iids: [String!]
""" """
Labels applied to this issue Labels applied to this issue
...@@ -5724,12 +5724,12 @@ type Project { ...@@ -5724,12 +5724,12 @@ type Project {
""" """
IID of the issue. For example, "1" IID of the issue. For example, "1"
""" """
iid: ID iid: String
""" """
List of IIDs of issues. For example, [1, 2] List of IIDs of issues. For example, [1, 2]
""" """
iids: [ID!] iids: [String!]
""" """
Labels applied to this issue Labels applied to this issue
...@@ -5799,12 +5799,12 @@ type Project { ...@@ -5799,12 +5799,12 @@ type Project {
""" """
The IID of the merge request, e.g., "1" The IID of the merge request, e.g., "1"
""" """
iid: ID iid: String
""" """
The list of IIDs of issues, e.g., [1, 2] The list of IIDs of issues, e.g., [1, 2]
""" """
iids: [ID!] iids: [String!]
): MergeRequest ): MergeRequest
""" """
...@@ -5829,12 +5829,12 @@ type Project { ...@@ -5829,12 +5829,12 @@ type Project {
""" """
The IID of the merge request, e.g., "1" The IID of the merge request, e.g., "1"
""" """
iid: ID iid: String
""" """
The list of IIDs of issues, e.g., [1, 2] The list of IIDs of issues, e.g., [1, 2]
""" """
iids: [ID!] iids: [String!]
""" """
Returns the last _n_ elements from the list. Returns the last _n_ elements from the list.
...@@ -8112,7 +8112,7 @@ input UpdateIssueInput { ...@@ -8112,7 +8112,7 @@ input UpdateIssueInput {
""" """
The iid of the issue to mutate The iid of the issue to mutate
""" """
iid: ID! iid: String!
""" """
The project the issue to mutate is in The project the issue to mutate is in
......
doc/api/graphql/reference/gitlab_schema.json
View file @ 45e3f2e5
...@@ -10768,7 +10768,7 @@ ...@@ -10768,7 +10768,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -10898,7 +10898,7 @@ ...@@ -10898,7 +10898,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -11028,7 +11028,7 @@ ...@@ -11028,7 +11028,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -11861,7 +11861,7 @@ ...@@ -11861,7 +11861,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13024,7 +13024,7 @@ ...@@ -13024,7 +13024,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13172,7 +13172,7 @@ ...@@ -13172,7 +13172,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13320,7 +13320,7 @@ ...@@ -13320,7 +13320,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13450,7 +13450,7 @@ ...@@ -13450,7 +13450,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13576,7 +13576,7 @@ ...@@ -13576,7 +13576,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -13706,7 +13706,7 @@ ...@@ -13706,7 +13706,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -16283,7 +16283,7 @@ ...@@ -16283,7 +16283,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
...@@ -17021,7 +17021,7 @@ ...@@ -17021,7 +17021,7 @@
"description": "IID of the issue. For example, \"1\"", "description": "IID of the issue. For example, \"1\"",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -17037,7 +17037,7 @@ ...@@ -17037,7 +17037,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
} }
...@@ -17200,7 +17200,7 @@ ...@@ -17200,7 +17200,7 @@
"description": "IID of the issue. For example, \"1\"", "description": "IID of the issue. For example, \"1\"",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -17216,7 +17216,7 @@ ...@@ -17216,7 +17216,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
} }
...@@ -17475,7 +17475,7 @@ ...@@ -17475,7 +17475,7 @@
"description": "The IID of the merge request, e.g., \"1\"", "description": "The IID of the merge request, e.g., \"1\"",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -17491,7 +17491,7 @@ ...@@ -17491,7 +17491,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
} }
...@@ -17516,7 +17516,7 @@ ...@@ -17516,7 +17516,7 @@
"description": "The IID of the merge request, e.g., \"1\"", "description": "The IID of the merge request, e.g., \"1\"",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -17532,7 +17532,7 @@ ...@@ -17532,7 +17532,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
} }
...@@ -24526,7 +24526,7 @@ ...@@ -24526,7 +24526,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "String",
"ofType": null "ofType": null
} }
}, },
......
doc/api/graphql/reference/index.md
View file @ 45e3f2e5
...@@ -630,7 +630,7 @@ Autogenerated return type of MarkAsSpamSnippet ...@@ -630,7 +630,7 @@ Autogenerated return type of MarkAsSpamSnippet
| `forceRemoveSourceBranch` | Boolean | Indicates if the project settings will lead to source branch deletion after merge | | `forceRemoveSourceBranch` | Boolean | Indicates if the project settings will lead to source branch deletion after merge |
| `headPipeline` | Pipeline | The pipeline running on the branch HEAD of the merge request | | `headPipeline` | Pipeline | The pipeline running on the branch HEAD of the merge request |
| `id` | ID! | ID of the merge request | | `id` | ID! | ID of the merge request |
| `iid` | ID! | Internal ID of the merge request | | `iid` | String! | Internal ID of the merge request |
| `inProgressMergeCommitSha` | String | Commit SHA of the merge request if merge is in progress | | `inProgressMergeCommitSha` | String | Commit SHA of the merge request if merge is in progress |
| `mergeCommitMessage` **{warning-solid}** | String | **Deprecated:** Renamed to defaultMergeCommitMessage | | `mergeCommitMessage` **{warning-solid}** | String | **Deprecated:** Renamed to defaultMergeCommitMessage |
| `mergeCommitSha` | String | SHA of the merge request commit (set once merged) | | `mergeCommitSha` | String | SHA of the merge request commit (set once merged) |
...@@ -834,7 +834,7 @@ Information about pagination in a connection. ...@@ -834,7 +834,7 @@ Information about pagination in a connection.
| `duration` | Int | Duration of the pipeline in seconds | | `duration` | Int | Duration of the pipeline in seconds |
| `finishedAt` | Time | Timestamp of the pipeline's completion | | `finishedAt` | Time | Timestamp of the pipeline's completion |
| `id` | ID! | ID of the pipeline | | `id` | ID! | ID of the pipeline |
| `iid` | ID! | Internal ID of the pipeline | | `iid` | String! | Internal ID of the pipeline |
| `sha` | String! | SHA of the pipeline's commit | | `sha` | String! | SHA of the pipeline's commit |
| `startedAt` | Time | Timestamp when the pipeline was started | | `startedAt` | Time | Timestamp when the pipeline was started |
| `status` | PipelineStatusEnum! | Status of the pipeline (CREATED, WAITING_FOR_RESOURCE, PREPARING, PENDING, RUNNING, FAILED, SUCCESS, CANCELED, SKIPPED, MANUAL, SCHEDULED) | | `status` | PipelineStatusEnum! | Status of the pipeline (CREATED, WAITING_FOR_RESOURCE, PREPARING, PENDING, RUNNING, FAILED, SUCCESS, CANCELED, SKIPPED, MANUAL, SCHEDULED) |
......
doc/development/api_graphql_styleguide.md
View file @ 45e3f2e5
...@@ -547,7 +547,7 @@ argument :project_path, GraphQL::ID_TYPE, ...@@ -547,7 +547,7 @@ argument :project_path, GraphQL::ID_TYPE,
required: true, required: true,
description: "The project the merge request to mutate is in" description: "The project the merge request to mutate is in"
argument :iid, GraphQL::ID_TYPE, argument :iid, GraphQL::STRING_TYPE,
required: true, required: true,
description: "The iid of the merge request to mutate" description: "The iid of the merge request to mutate"
......
ee/app/assets/javascripts/design_management/graphql/queries/getDesign.query.graphql
View file @ 45e3f2e5
#import "../fragments/design.fragment.graphql" #import "../fragments/design.fragment.graphql"
#import "~/graphql_shared/fragments/author.fragment.graphql" #import "~/graphql_shared/fragments/author.fragment.graphql"
query getDesign($fullPath: ID!, $iid: ID!, $atVersion: ID, $filenames: [String!]) { query getDesign($fullPath: ID!, $iid: String!, $atVersion: ID, $filenames: [String!]) {
project(fullPath: $fullPath) { project(fullPath: $fullPath) {
id id
issue(iid: $iid) { issue(iid: $iid) {
......
ee/app/assets/javascripts/design_management/graphql/queries/permissions.query.graphql
View file @ 45e3f2e5
query permissions($fullPath: ID!, $iid: ID!) { query permissions($fullPath: ID!, $iid: String!) {
project(fullPath: $fullPath) { project(fullPath: $fullPath) {
id id
issue(iid: $iid) { issue(iid: $iid) {
......
ee/app/assets/javascripts/design_management/graphql/queries/project.query.graphql
View file @ 45e3f2e5
#import "../fragments/designList.fragment.graphql" #import "../fragments/designList.fragment.graphql"
#import "../fragments/version.fragment.graphql" #import "../fragments/version.fragment.graphql"
query project($fullPath: ID!, $iid: ID!, $atVersion: ID) { query project($fullPath: ID!, $iid: String!, $atVersion: ID) {
project(fullPath: $fullPath) { project(fullPath: $fullPath) {
id id
issue(iid: $iid) { issue(iid: $iid) {
......
ee/app/assets/javascripts/sidebar/queries/sidebarDetails.query.graphql
View file @ 45e3f2e5
query ($fullPath: ID!, $iid: ID!) { query ($fullPath: ID!, $iid: String!) {
project (fullPath: $fullPath) { project (fullPath: $fullPath) {
issue (iid: $iid) { issue (iid: $iid) {
iid iid
......
ee/app/assets/javascripts/sidebar/queries/sidebarDetailsForHealthStatusFeatureFlag.query.graphql
View file @ 45e3f2e5
query ($fullPath: ID!, $iid: ID!) { query ($fullPath: ID!, $iid: String!) {
project (fullPath: $fullPath) { project (fullPath: $fullPath) {
issue (iid: $iid) { issue (iid: $iid) {
healthStatus healthStatus
......
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