diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-03 21:09:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-03 21:09:58 +0300 |
commit | 524639c7063131c40b848789ff541758b68c1cca (patch) | |
tree | eef8ce631ab44dfaefe71c54d2a4d248d8fd3c69 /doc/api | |
parent | 4f41b713eb264096903c168375815adec96ab8ac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/settings.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index ada1d0e7fc4..406688732fe 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -241,6 +241,7 @@ listed in the descriptions of the relevant settings. | `check_namespace_plan` | boolean | no | **(PREMIUM)** Enabling this makes only licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public. | | `commit_email_hostname` | string | no | Custom hostname (for private commit emails). | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes. | +| `deactivate_dormant_users` | boolean | no | Enable [atomatic deactivation of dormant users](../user/admin_area/moderate_users.md#automatically-deactivate-dormant-users). | | `default_artifacts_expire_in` | string | no | Set the default expiration time for each job's artifacts. | | `default_branch_protection` | integer | no | Determine if developers can push to the default branch. Can take: `0` _(not protected, both developers and maintainers can push new commits, force push, or delete the branch)_, `1` _(partially protected, developers and maintainers can push new commits, but cannot force push, or delete, the branch)_ or `2` _(fully protected, developers cannot push new commits, but maintainers can; no-one can force push or delete the branch)_ as a parameter. Default is `2`. | | `default_ci_config_path` | string | no | Default CI configuration path for new projects (`.gitlab-ci.yml` if not set). | |