diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 09:06:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 09:06:19 +0300 |
commit | 7e20809103e1f9c0c96c3a96705224c81bf448d5 (patch) | |
tree | afc4e940a8b9e865aa95d406f2c52f47c232a8fd /doc | |
parent | a264dc20c7b1f9bf7863a2a8048324d28aafaac0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/packages/container_registry.md | 4 | ||||
-rw-r--r-- | doc/api/project_import_export.md | 2 | ||||
-rw-r--r-- | doc/user/group/subgroups/index.md | 13 |
3 files changed, 11 insertions, 8 deletions
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index ae7f17e4ff4..58a34607e2d 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -5,8 +5,8 @@ > Docker versions earlier than 1.10. NOTE: **Note:** -This document is about the admin guide. To learn how to use GitLab Container -Registry [user documentation](../../user/packages/container_registry/index.md). +This document is the administrator's guide. To learn how to use GitLab Container +Registry, see the [user documentation](../../user/packages/container_registry/index.md). With the Container Registry integrated into GitLab, every project can have its own space to store its Docker images. diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md index 7040646641b..cd02d423a9f 100644 --- a/doc/api/project_import_export.md +++ b/doc/api/project_import_export.md @@ -137,7 +137,7 @@ from io import BytesIO s3_file = requests.get(presigned_url) url = 'https://gitlab.example.com/api/v4/projects/import' -files = {'file': BytesIO(s3_file.content)} +files = {'file': ('file.tar.gz', BytesIO(s3_file.content))} data = { "path": "example-project", "namespace": "example-group" diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index eec929e3309..376d4510934 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -4,8 +4,7 @@ type: reference, howto, concepts # Subgroups -NOTE: **Note:** -[Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/2772) in GitLab 9.0. +>[Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/2772) in GitLab 9.0. Subgroups, also known as nested groups or hierarchical groups, allow you to have up to 20 levels of groups. @@ -68,9 +67,9 @@ Another example of GitLab as a company would be the following: The maximum subgroups a group can have, including the first one in the hierarchy, is 21. -Actions such as transferring or importing a project inside subgroups, work like -when performing these actions the traditional way with the `group/project` -structure. +When performing actions such as transferring or importing a project between +subgroups, the behavior is the same as when performing these actions at the +`group/project` level. ## Creating a subgroup @@ -117,6 +116,10 @@ When you add a member to a subgroup, they inherit the membership and permission level from the parent group. This model allows access to nested groups if you have membership in one of its parents. +Jobs for pipelines in subgroups can use [Runners](../../../ci/runners/README.md) registered to the parent group. This means secrets configured for the parent group are available to subgroup jobs. + +In addition, maintainers of projects that belong to subgroups can see the details of Runners registered to parent groups. + The group permissions for a member can be changed only by Owners, and only on the **Members** page of the group the member was added. |