diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 18:09:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 18:09:27 +0300 |
commit | 8d4aaa4dd07cd02383f7d09d74eb66ffe47a41c4 (patch) | |
tree | 684210b8b7c8b5664e8d7b529e59ffde6bcfaed4 /doc/api | |
parent | cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.graphql | 40 | ||||
-rw-r--r-- | doc/api/graphql/reference/gitlab_schema.json | 40 | ||||
-rw-r--r-- | doc/api/graphql/reference/index.md | 4 | ||||
-rw-r--r-- | doc/api/releases/index.md | 12 |
4 files changed, 51 insertions, 45 deletions
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index 652d2c7611d..b6caff283fc 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -3757,7 +3757,7 @@ input IssueSetConfidentialInput { """ The iid of the issue to mutate """ - iid: ID! + iid: String! """ The project the issue to mutate is in @@ -3802,7 +3802,7 @@ input IssueSetDueDateInput { """ The iid of the issue to mutate """ - iid: ID! + iid: String! """ The project the issue to mutate is in @@ -3842,7 +3842,7 @@ input IssueSetWeightInput { """ The iid of the issue to mutate """ - iid: ID! + iid: String! """ The project the issue to mutate is in @@ -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. @@ -8112,7 +8112,7 @@ input UpdateIssueInput { """ The iid of the issue to mutate """ - iid: ID! + iid: String! """ The project the issue to mutate is in diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 829fa5ab0df..38eae822983 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -10768,7 +10768,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, @@ -10898,7 +10898,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, @@ -11028,7 +11028,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, @@ -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 } } @@ -24526,7 +24526,7 @@ "name": null, "ofType": { "kind": "SCALAR", - "name": "ID", + "name": "String", "ofType": null } }, diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 57a9c5d952a..a85553ce4aa 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -630,7 +630,7 @@ Autogenerated return type of MarkAsSpamSnippet | `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 | | `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 | | `mergeCommitMessage` **{warning-solid}** | String | **Deprecated:** Renamed to defaultMergeCommitMessage | | `mergeCommitSha` | String | SHA of the merge request commit (set once merged) | @@ -834,7 +834,7 @@ Information about pagination in a connection. | `duration` | Int | Duration of the pipeline in seconds | | `finishedAt` | Time | Timestamp of the pipeline's completion | | `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 | | `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) | diff --git a/doc/api/releases/index.md b/doc/api/releases/index.md index 6e98076b7e2..c2dd9108364 100644 --- a/doc/api/releases/index.md +++ b/doc/api/releases/index.md @@ -308,7 +308,12 @@ Example response: } ], "links":[ - + { + "id":3, + "name":"hoge", + "url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64", + "external":true + } ], "evidence_url":"https://gitlab.example.com/root/awesome-app/-/releases/v0.1/evidence.json" }, @@ -334,13 +339,14 @@ POST /projects/:id/releases | `assets:links` | array of hash | no | An array of assets links. | | `assets:links:name`| string | required by: `assets:links` | The name of the link. | | `assets:links:url` | string | required by: `assets:links` | The url of the link. | +| `assets:links:filepath` | string | no | Optional path for a [Direct Asset link](../../user/project/releases.md). | `released_at` | datetime | no | The date when the release will be/was ready. Defaults to the current time. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`). | Example request: ```shell curl --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: gDybLx3yrUK_HLp3qPjS" \ - --data '{ "name": "New release", "tag_name": "v0.3", "description": "Super nice release", "milestones": ["v1.0", "v1.0-rc"], "assets": { "links": [{ "name": "hoge", "url": "https://google.com" }] } }' \ + --data '{ "name": "New release", "tag_name": "v0.3", "description": "Super nice release", "milestones": ["v1.0", "v1.0-rc"], "assets": { "links": [{ "name": "hoge", "url": "https://google.com", "filepath": "/binaries/linux-amd64" }] } }' \ --request POST https://gitlab.example.com/api/v4/projects/24/releases ``` @@ -441,7 +447,7 @@ Example response: { "id":3, "name":"hoge", - "url":"https://google.com", + "url":"https://gitlab.example.com/root/awesome-app/-/tags/v0.11.1/binaries/linux-amd64", "external":true } ], |