diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 06:06:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 06:06:06 +0300 |
| commit | bee11af56deccfd13243cf5f31d42bd992404066 (patch) | |
| tree | 33a96f286cb182f43145972afa2b6d82d541f6ca | |
| parent | 8c726c7487db581867ade785f798d84315cb787e (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
| -rw-r--r-- | doc/user/permissions.md | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 4bb065f08b0..6f096c59c5c 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1289,7 +1289,7 @@ globally and all jobs will use that definition. #### `cache:paths` -Use the `paths` directive to choose which files or directories will be cached. +Use the `paths` directive to choose which files or directories will be cached. You can only specify paths within your `$CI_PROJECT_DIR`. Wildcards can be used that follow the [glob](https://en.wikipedia.org/wiki/Glob_(programming)) patterns and [filepath.Match](https://golang.org/pkg/path/filepath/#Match). Cache all files in `binaries` that end in `.apk` and the `.config` file: diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 4381012abf5..771619b7a36 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -211,7 +211,7 @@ group. | View group epic **(ULTIMATE)** | ✓ | ✓ | ✓ | ✓ | ✓ | | Create/edit group epic **(ULTIMATE)** | | ✓ | ✓ | ✓ | ✓ | | Manage group labels | | ✓ | ✓ | ✓ | ✓ | -| Create project in group | | | ✓ | ✓ | ✓ | +| Create project in group | | | ✓ (3) | ✓ (3) | ✓ (3) | | Create/edit/delete group milestones | | | ✓ | ✓ | ✓ | | Enable/disable a dependency proxy **(PREMIUM)** | | | ✓ | ✓ | ✓ | | Use security dashboard **(ULTIMATE)** | | | ✓ | ✓ | ✓ | @@ -228,6 +228,9 @@ group. - (1): Groups can be set to [allow either Owners or Owners and Maintainers to create subgroups](group/subgroups/index.md#creating-a-subgroup) - (2): Introduced in GitLab 12.2. +- (3): Default project creation role can be changed at: + - The [instance level](admin_area/settings/visibility_and_access_controls.md#default-project-creation-protection). + - The [group level](group/index.html#default-project-creation-level). ### Subgroup permissions |