diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:07:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 15:07:29 +0000 |
commit | 3318518149062e5d17105f2170bd7bd9647af415 (patch) | |
tree | a2e49b8fea4543717ca006e9d06bdc032d5d4281 /doc/api/settings.md | |
parent | 4e516dbff9767a35677fdc4a6e39005b4b564376 (diff) | |
download | gitlab-ce-3318518149062e5d17105f2170bd7bd9647af415.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
-rw-r--r-- | doc/api/settings.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 0fb742982f4..f63466298e3 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -40,6 +40,7 @@ Example response: "domain_blacklist_enabled" : false, "domain_blacklist" : [], "created_at" : "2016-01-04T15:44:55.176Z", + "default_ci_config_path" : null, "default_project_visibility" : "private", "default_group_visibility" : "private", "gravatar_enabled" : true, @@ -113,6 +114,7 @@ Example response: "restricted_visibility_levels": [], "max_attachment_size": 10, "session_expire_delay": 10080, + "default_ci_config_path" : null, "default_project_visibility": "internal", "default_snippet_visibility": "private", "default_group_visibility": "private", @@ -198,6 +200,7 @@ are listed in the descriptions of the relevant settings. | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes. | | `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 master. 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). | | `default_group_visibility` | string | no | What visibility level new groups receive. Can take `private`, `internal` and `public` as a parameter. Default is `private`. | | `default_project_creation` | integer | no | Default project creation protection. Can take: `0` _(No one)_, `1` _(Maintainers)_ or `2` _(Developers + Maintainers)_| | `default_projects_limit` | integer | no | Project limit per user. Default is `100000`. | |