diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 15:10:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 15:10:51 +0300 |
commit | 6081c1224414da0b6bf033c14a2b7c4dff3c0b5d (patch) | |
tree | 9e6a1053aaef754fdc712f1b203621ec0b3f82c4 /doc/api | |
parent | 550096a3bf94b5d8e2b74dc8f94fbb0c579a7313 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/access_requests.md | 2 | ||||
-rw-r--r-- | doc/api/appearance.md | 2 | ||||
-rw-r--r-- | doc/api/applications.md | 2 | ||||
-rw-r--r-- | doc/api/avatar.md | 2 | ||||
-rw-r--r-- | doc/api/graphql/reference/index.md | 17 | ||||
-rw-r--r-- | doc/api/graphql/users_example.md | 2 | ||||
-rw-r--r-- | doc/api/group_access_tokens.md | 2 | ||||
-rw-r--r-- | doc/api/member_roles.md | 2 | ||||
-rw-r--r-- | doc/api/members.md | 2 | ||||
-rw-r--r-- | doc/api/namespaces.md | 2 | ||||
-rw-r--r-- | doc/api/oauth2.md | 2 | ||||
-rw-r--r-- | doc/api/plan_limits.md | 2 | ||||
-rw-r--r-- | doc/api/project_access_tokens.md | 2 | ||||
-rw-r--r-- | doc/api/saml.md | 2 | ||||
-rw-r--r-- | doc/api/scim.md | 2 | ||||
-rw-r--r-- | doc/api/settings.md | 2 | ||||
-rw-r--r-- | doc/api/statistics.md | 2 | ||||
-rw-r--r-- | doc/api/users.md | 2 | ||||
-rw-r--r-- | doc/api/wikis.md | 18 |
19 files changed, 43 insertions, 26 deletions
diff --git a/doc/api/access_requests.md b/doc/api/access_requests.md index bd4c4df5660..201a7161c56 100644 --- a/doc/api/access_requests.md +++ b/doc/api/access_requests.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments" --- diff --git a/doc/api/appearance.md b/doc/api/appearance.md index 4018e787acf..d2a2f0687b2 100644 --- a/doc/api/appearance.md +++ b/doc/api/appearance.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/applications.md b/doc/api/applications.md index 9875dfab96d..64516465cfa 100644 --- a/doc/api/applications.md +++ b/doc/api/applications.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/avatar.md b/doc/api/avatar.md index 98e644d9ae9..72dff3c1174 100644 --- a/doc/api/avatar.md +++ b/doc/api/avatar.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 639ce943877..5f0c2a1106c 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -13981,6 +13981,18 @@ Represents how the blob content should be displayed. | <a id="blobviewertoolarge"></a>`tooLarge` | [`Boolean!`](#boolean) | Shows whether the blob is too large to be displayed. | | <a id="blobviewertype"></a>`type` | [`BlobViewersType!`](#blobviewerstype) | Type of blob viewer. | +### `BlockingMergeRequests` + +Information about the rules that must be satisfied to merge this merge request. + +#### Fields + +| Name | Type | Description | +| ---- | ---- | ----------- | +| <a id="blockingmergerequestshiddencount"></a>`hiddenCount` | [`Int!`](#int) | Blocking merge requests not visible to the user. | +| <a id="blockingmergerequeststotalcount"></a>`totalCount` | [`Int!`](#int) | Total number of blocking merge requests. | +| <a id="blockingmergerequestsvisiblemergerequests"></a>`visibleMergeRequests` | [`[MergeRequest!]`](#mergerequest) | Blocking merge requests visible to the user. | + ### `Board` Represents a project or group issue board. @@ -19770,6 +19782,7 @@ Defines which user roles, users, or groups can merge into a protected branch. | <a id="mergerequestautomergestrategy"></a>`autoMergeStrategy` | [`String`](#string) | Selected auto merge strategy. | | <a id="mergerequestavailableautomergestrategies"></a>`availableAutoMergeStrategies` | [`[String!]`](#string) | Array of available auto merge strategies. | | <a id="mergerequestawardemoji"></a>`awardEmoji` | [`AwardEmojiConnection`](#awardemojiconnection) | List of emoji reactions associated with the merge request. (see [Connections](#connections)) | +| <a id="mergerequestblockingmergerequests"></a>`blockingMergeRequests` **{warning-solid}** | [`BlockingMergeRequests`](#blockingmergerequests) | **Introduced** in 16.5. This feature is an Experiment. It can be changed or removed at any time. Merge requests that block another merge request from merging. | | <a id="mergerequestcodequalityreportscomparer"></a>`codequalityReportsComparer` **{warning-solid}** | [`CodequalityReportsComparer`](#codequalityreportscomparer) | **Introduced** in 16.4. This feature is an Experiment. It can be changed or removed at any time. Code quality reports comparison reported on the merge request. Returns `null` if `sast_reports_in_inline_diff` feature flag is disabled. | | <a id="mergerequestcommenters"></a>`commenters` | [`UserCoreConnection!`](#usercoreconnection) | All commenters on this noteable. (see [Connections](#connections)) | | <a id="mergerequestcommitcount"></a>`commitCount` | [`Int`](#int) | Number of commits in the merge request. | @@ -21662,6 +21675,7 @@ Represents a package with pipelines in the Package Registry. | <a id="packagepipelines"></a>`pipelines` | [`PipelineConnection`](#pipelineconnection) | Pipelines that built the package. Max page size 20. (see [Connections](#connections)) | | <a id="packageproject"></a>`project` | [`Project!`](#project) | Project where the package is stored. | | <a id="packagestatus"></a>`status` | [`PackageStatus!`](#packagestatus) | Package status. | +| <a id="packagestatusmessage"></a>`statusMessage` | [`String`](#string) | Status message. | | <a id="packagetags"></a>`tags` | [`PackageTagConnection`](#packagetagconnection) | Package tags. (see [Connections](#connections)) | | <a id="packageupdatedat"></a>`updatedAt` | [`Time!`](#time) | Date of most recent update. | | <a id="packageversion"></a>`version` | [`String`](#string) | Version string. | @@ -21683,6 +21697,7 @@ Represents a package in the Package Registry. | <a id="packagebasepackagetype"></a>`packageType` | [`PackageTypeEnum!`](#packagetypeenum) | Package type. | | <a id="packagebaseproject"></a>`project` | [`Project!`](#project) | Project where the package is stored. | | <a id="packagebasestatus"></a>`status` | [`PackageStatus!`](#packagestatus) | Package status. | +| <a id="packagebasestatusmessage"></a>`statusMessage` | [`String`](#string) | Status message. | | <a id="packagebasetags"></a>`tags` | [`PackageTagConnection`](#packagetagconnection) | Package tags. (see [Connections](#connections)) | | <a id="packagebaseupdatedat"></a>`updatedAt` | [`Time!`](#time) | Date of most recent update. | | <a id="packagebaseversion"></a>`version` | [`String`](#string) | Version string. | @@ -21755,6 +21770,7 @@ Represents a package details in the Package Registry. | <a id="packagedetailstypepypisetupurl"></a>`pypiSetupUrl` | [`String`](#string) | Url of the PyPi project setup endpoint. | | <a id="packagedetailstypepypiurl"></a>`pypiUrl` | [`String`](#string) | Url of the PyPi project endpoint. | | <a id="packagedetailstypestatus"></a>`status` | [`PackageStatus!`](#packagestatus) | Package status. | +| <a id="packagedetailstypestatusmessage"></a>`statusMessage` | [`String`](#string) | Status message. | | <a id="packagedetailstypetags"></a>`tags` | [`PackageTagConnection`](#packagetagconnection) | Package tags. (see [Connections](#connections)) | | <a id="packagedetailstypeupdatedat"></a>`updatedAt` | [`Time!`](#time) | Date of most recent update. | | <a id="packagedetailstypeversion"></a>`version` | [`String`](#string) | Version string. | @@ -26923,6 +26939,7 @@ Represents a hierarchy widget. | Name | Type | Description | | ---- | ---- | ----------- | +| <a id="workitemwidgethierarchyancestors"></a>`ancestors` | [`WorkItemConnection`](#workitemconnection) | Ancestors (parents) of the work item. (see [Connections](#connections)) | | <a id="workitemwidgethierarchychildren"></a>`children` | [`WorkItemConnection`](#workitemconnection) | Child work items. (see [Connections](#connections)) | | <a id="workitemwidgethierarchyhaschildren"></a>`hasChildren` | [`Boolean!`](#boolean) | Indicates if the work item has children. | | <a id="workitemwidgethierarchyparent"></a>`parent` | [`WorkItem`](#workitem) | Parent work item. | diff --git a/doc/api/graphql/users_example.md b/doc/api/graphql/users_example.md index 0fd61689b8e..4aadf9ea76b 100644 --- a/doc/api/graphql/users_example.md +++ b/doc/api/graphql/users_example.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/group_access_tokens.md b/doc/api/group_access_tokens.md index b99c91d2e5c..18469741814 100644 --- a/doc/api/group_access_tokens.md +++ b/doc/api/group_access_tokens.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/member_roles.md b/doc/api/member_roles.md index dc31c99f9e8..79f7bc2b3ad 100644 --- a/doc/api/member_roles.md +++ b/doc/api/member_roles.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/members.md b/doc/api/members.md index 978fc691676..de59c66890d 100644 --- a/doc/api/members.md +++ b/doc/api/members.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md index 816d6b3dcbb..794da9d8f96 100644 --- a/doc/api/namespaces.md +++ b/doc/api/namespaces.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md index d1eb4df0e37..ee6c32d8f60 100644 --- a/doc/api/oauth2.md +++ b/doc/api/oauth2.md @@ -1,7 +1,7 @@ --- type: reference, howto stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/plan_limits.md b/doc/api/plan_limits.md index 789acf46205..383d7aa1966 100644 --- a/doc/api/plan_limits.md +++ b/doc/api/plan_limits.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/project_access_tokens.md b/doc/api/project_access_tokens.md index 1ce4ebaa787..2f386e22001 100644 --- a/doc/api/project_access_tokens.md +++ b/doc/api/project_access_tokens.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/saml.md b/doc/api/saml.md index 77a23c4c298..911586933fa 100644 --- a/doc/api/saml.md +++ b/doc/api/saml.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/scim.md b/doc/api/scim.md index f98267cfd4a..a511386fb96 100644 --- a/doc/api/scim.md +++ b/doc/api/scim.md @@ -1,7 +1,7 @@ --- type: reference, howto stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- # SCIM API **(PREMIUM SAAS)** diff --git a/doc/api/settings.md b/doc/api/settings.md index b5551962644..95d6247fea4 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/statistics.md b/doc/api/statistics.md index b60b012e339..da94a5ce740 100644 --- a/doc/api/statistics.md +++ b/doc/api/statistics.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/users.md b/doc/api/users.md index d3efa48fcf9..118008848f3 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1,6 +1,6 @@ --- stage: Govern -group: Authentication and Authorization +group: Authentication info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/wikis.md b/doc/api/wikis.md index 503312bfe7c..0b61d92177f 100644 --- a/doc/api/wikis.md +++ b/doc/api/wikis.md @@ -90,7 +90,7 @@ Example response: ## Create a new wiki page -Creates a new wiki page for the given repository with the given title, slug and content. +Creates a new wiki page for the given repository with the given title, slug, and content. ```plaintext POST /projects/:id/wikis @@ -101,7 +101,7 @@ POST /projects/:id/wikis | `id` | integer/string | Yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | | `content` | string | Yes | The content of the wiki page. | | `title` | string | Yes | The title of the wiki page. | -| `format` | string | No | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc` and `org`. | +| `format` | string | No | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc`, and `org`. | ```shell curl --data "format=rdoc&title=Hello&content=Hello world" \ @@ -128,13 +128,13 @@ Updates an existing wiki page. At least one parameter is required to update the PUT /projects/:id/wikis/:slug ``` -| Attribute | Type | Required | Description | -| --------- | ------- | ---------------------------------- | ----------- | -| `id` | integer/string | Yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | -| `content` | string | Yes, if `title` is not provided. | The content of the wiki page. | -| `title` | string | Yes, if `content` is not provided. | The title of the wiki page. | -| `format` | string | No | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc` and `org`. | -| `slug` | string | Yes | URL-encoded slug (a unique string) of the wiki page, such as `dir%2Fpage_name`. | +| Attribute | Type | Required | Description | +| --------- | ------- | --------------------------------- | ----------- | +| `id` | integer/string | Yes | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding). | +| `content` | string | Yes, if `title` is not provided | The content of the wiki page. | +| `title` | string | Yes, if `content` is not provided | The title of the wiki page. | +| `format` | string | No | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc`, and `org`. | +| `slug` | string | Yes | URL-encoded slug (a unique string) of the wiki page, such as `dir%2Fpage_name`. | ```shell curl --request PUT --data "format=rdoc&content=documentation&title=Docs" \ |