From 4e65fc3589914bc328539943f1164f4aff2b8d58 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 12 May 2023 00:12:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/discussions.md | 10 +++++----- doc/api/graphql/reference/index.md | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'doc/api') diff --git a/doc/api/discussions.md b/doc/api/discussions.md index 3eeef5d4afc..15bbc802817 100644 --- a/doc/api/discussions.md +++ b/doc/api/discussions.md @@ -855,7 +855,7 @@ Parameters: | Attribute | Type | Required | Description | | ------------------- | -------------- | -------- | ----------- | -| `discussion_id` | integer | yes | The ID of a discussion item. | +| `discussion_id` | string | yes | The ID of a discussion item. | | `id` | integer or string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `merge_request_iid` | integer | yes | The IID of a merge request. | @@ -1023,7 +1023,7 @@ Parameters: | Attribute | Type | Required | Description | | ------------------- | -------------- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | -| `discussion_id` | integer | yes | The ID of a thread. | +| `discussion_id` | string | yes | The ID of a thread. | | `merge_request_iid` | integer | yes | The IID of a merge request. | | `resolved` | boolean | yes | Resolve or unresolve the discussion. | @@ -1047,7 +1047,7 @@ Parameters: | ------------------- | -------------- | -------- | ----------- | | `body` | string | yes | The content of the note or reply. | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | -| `discussion_id` | integer | yes | The ID of a thread. | +| `discussion_id` | string | yes | The ID of a thread. | | `merge_request_iid` | integer | yes | The IID of a merge request. | | `note_id` | integer | yes | The ID of a thread note. | | `created_at` | string | no | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z`. Requires administrator or project/group owner rights. | @@ -1069,7 +1069,7 @@ Parameters: | Attribute | Type | Required | Description | | ------------------- | -------------- | -------- | ----------- | -| `discussion_id` | integer | yes | The ID of a thread. | +| `discussion_id` | string | yes | The ID of a thread. | | `id` | integer or string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `merge_request_iid` | integer | yes | The IID of a merge request. | | `note_id` | integer | yes | The ID of a thread note. | @@ -1100,7 +1100,7 @@ Parameters: | Attribute | Type | Required | Description | | ------------------- | -------------- | -------- | ----------- | -| `discussion_id` | integer | yes | The ID of a thread. | +| `discussion_id` | string | yes | The ID of a thread. | | `id` | integer or string | yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `merge_request_iid` | integer | yes | The IID of a merge request. | | `note_id` | integer | yes | The ID of a thread note. | diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 263689894ca..938c2b812e6 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -1463,6 +1463,7 @@ Input type: `CiAiGenerateConfigInput` | ---- | ---- | ----------- | | `clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. | | `errors` | [`[String!]!`](#string) | Errors encountered during execution of the mutation. | +| `userMessage` | [`AiMessageType`](#aimessagetype) | User chat message. | ### `Mutation.ciCdSettingsUpdate` -- cgit v1.2.3