diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 14:15:38 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-01 14:15:38 +0000 |
commit | 28b374eea4e2890514067ac7875b4c1d252c5cdd (patch) | |
tree | 9fe30ae35df4b83cee000e1a0880b390d88d80f0 /doc/api | |
parent | c8fd9c521b89b98797cfd6e3a51cae6955129c20 (diff) | |
download | gitlab-ce-28b374eea4e2890514067ac7875b4c1d252c5cdd.tar.gz |
Add latest changes from gitlab-org/gitlab@15-3-stable-ee
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/groups.md | 16 | ||||
-rw-r--r-- | doc/api/settings.md | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/doc/api/groups.md b/doc/api/groups.md index 588ab2a5821..9cbd12e664c 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -1444,7 +1444,7 @@ response attributes: | Attribute | Type | Description | |:-------------------|:-------|:-------------------------------------------------------------------------------------| | `[].name` | string | Name of the SAML group | -| `[].access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | +| `[].access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | Example request: @@ -1458,11 +1458,11 @@ Example response: [ { "name": "saml-group-1", - "access_level": "Guest" + "access_level": 10 }, { "name": "saml-group-2", - "access_level": "Maintainer" + "access_level": 40 } ] ``` @@ -1488,7 +1488,7 @@ response attributes: | Attribute | Type | Description | |:---------------|:-------|:-------------------------------------------------------------------------------------| | `name` | string | Name of the SAML group | -| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | +| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | Example request: @@ -1501,7 +1501,7 @@ Example response: ```json { "name": "saml-group-1", -"access_level": "Guest" +"access_level": 10 } ``` @@ -1519,7 +1519,7 @@ Supported attributes: |:-------------------|:---------------|:---------|:-------------------------------------------------------------------------------------| | `id` | integer/string | yes | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding) | | `saml_group_name` | string | yes | Name of a SAML group | -| `access_level` | string | yes | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | +| `access_level` | integer | yes | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | If successful, returns [`201`](index.md#status-codes) and the following response attributes: @@ -1527,7 +1527,7 @@ response attributes: | Attribute | Type | Description | |:---------------|:-------|:-------------------------------------------------------------------------------------| | `name` | string | Name of the SAML group | -| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | +| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group | Example request: @@ -1540,7 +1540,7 @@ Example response: ```json { "name": "saml-group-1", -"access_level": "Guest" +"access_level": 10 } ``` diff --git a/doc/api/settings.md b/doc/api/settings.md index c736c0df1da..d11269113a1 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -274,6 +274,7 @@ listed in the descriptions of the relevant settings. | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes. | | `package_registry_cleanup_policies_worker_capacity` | integer | no | Number of workers assigned to the packages cleanup policies. | | `deactivate_dormant_users` | boolean | no | Enable [automatic deactivation of dormant users](../user/admin_area/moderate_users.md#automatically-deactivate-dormant-users). | +| `deactivate_dormant_users_period` | integer | no | Length of time (in days) after which a user is considered dormant. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336747) in GitLab 15.3. | | `default_artifacts_expire_in` | string | no | Set the default expiration time for each job's artifacts. | | `default_branch_name` | string | no | [Instance-level custom initial branch name](../user/project/repository/branches/default.md#instance-level-custom-initial-branch-name) ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225258) in GitLab 13.2). | | `default_branch_protection` | integer | no | Determine if developers can push to the default branch. Can take: `0` _(not protected, both users with the Developer role or Maintainer role can push new commits and force push)_, `1` _(partially protected, users with the Developer role or Maintainer role can push new commits, but cannot force push)_ or `2` _(fully protected, users with the Developer or Maintainer role cannot push new commits, but users with the Developer or Maintainer role can; no one can force push)_ as a parameter. Default is `2`. | |