From 65d6f87328680e57583552efe4c9fa1da31e525e Mon Sep 17 00:00:00 2001 From: Marcia Ramos Date: Mon, 14 Aug 2017 16:15:51 -0300 Subject: move "share projects with groups" docs - correct the file tree - remove duplicate doc - move to project/members/ - move images - update links --- doc/user/group/index.md | 10 ++++- doc/user/project/members/img/max_access_level.png | Bin 0 -> 34718 bytes .../img/other_group_sees_shared_project.png | Bin 0 -> 30182 bytes .../members/img/share_project_with_groups.png | Bin 0 -> 30307 bytes doc/user/project/members/index.md | 2 +- .../project/members/share_project_with_groups.md | 41 +++++++++++++++++++++ doc/workflow/README.md | 3 +- doc/workflow/groups/max_access_level.png | Bin 34718 -> 0 bytes .../groups/other_group_sees_shared_project.png | Bin 30182 -> 0 bytes doc/workflow/groups/share_project_with_groups.png | Bin 30307 -> 0 bytes doc/workflow/share_projects_with_other_groups.md | 33 +---------------- doc/workflow/share_with_group.md | 14 +------ 12 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 doc/user/project/members/img/max_access_level.png create mode 100644 doc/user/project/members/img/other_group_sees_shared_project.png create mode 100644 doc/user/project/members/img/share_project_with_groups.png create mode 100644 doc/user/project/members/share_project_with_groups.md delete mode 100644 doc/workflow/groups/max_access_level.png delete mode 100644 doc/workflow/groups/other_group_sees_shared_project.png delete mode 100644 doc/workflow/groups/share_project_with_groups.png diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 08da721c71d..ceec8b74373 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -153,6 +153,14 @@ Find this option under your project's settings. GitLab administrators can use the admin interface to move any project to any namespace if needed. +## Sharing a project with a group + +You can [share your projects with a group](../project/members/share_project_with_groups.md) +and give your group members access to the project all at once. + +Alternatively, with [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/), +you can [lock the sharing with group feature](#share-with-group-lock-ees-eep). + ## Manage group memberships via LDAP In GitLab Enterprise Edition it is possible to manage GitLab group memberships using LDAP groups. @@ -189,7 +197,7 @@ Learn more about [Member Lock](https://docs.gitlab.com/ee/user/group/index.html# In [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/) it is possible to prevent projects in a group from [sharing -a project with another group](../../workflow/share_projects_with_other_groups.md). +a project with another group](../project/members/share_project_with_groups.md). This allows for tighter control over project access. Learn more about [Share with group lock](https://docs.gitlab.com/ee/user/group/index.html#share-with-group-lock-ees-eep). diff --git a/doc/user/project/members/img/max_access_level.png b/doc/user/project/members/img/max_access_level.png new file mode 100644 index 00000000000..63f33f9d91d Binary files /dev/null and b/doc/user/project/members/img/max_access_level.png differ diff --git a/doc/user/project/members/img/other_group_sees_shared_project.png b/doc/user/project/members/img/other_group_sees_shared_project.png new file mode 100644 index 00000000000..67af27043eb Binary files /dev/null and b/doc/user/project/members/img/other_group_sees_shared_project.png differ diff --git a/doc/user/project/members/img/share_project_with_groups.png b/doc/user/project/members/img/share_project_with_groups.png new file mode 100644 index 00000000000..3cb4796f9f7 Binary files /dev/null and b/doc/user/project/members/img/share_project_with_groups.png differ diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md index f1e6e3d947b..b8dd96087f1 100644 --- a/doc/user/project/members/index.md +++ b/doc/user/project/members/index.md @@ -113,4 +113,4 @@ If you change your mind before your request is approved, just click the ## Share project with group -Alternatively, you can [share a project with an entire group](share_project_with_group.md) instead of adding users one by one. +Alternatively, you can [share a project with an entire group](share_project_with_groups.md) instead of adding users one by one. diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md new file mode 100644 index 00000000000..4c1ddcdcba8 --- /dev/null +++ b/doc/user/project/members/share_project_with_groups.md @@ -0,0 +1,41 @@ +# Share Projects with other Groups + +You can share projects with other [groups](../../group/index.md). This makes it +possible to add a group of users to a project with a single action. + +## Groups as collections of users + +Groups are used primarily to [create collections of projects](../user/group/index.md), but you can also +take advantage of the fact that groups define collections of _users_, namely the group +members. + +## Sharing a project with a group of users + +The primary mechanism to give a group of users, say 'Engineering', access to a project, +say 'Project Acme', in GitLab is to make the 'Engineering' group the owner of 'Project +Acme'. But what if 'Project Acme' already belongs to another group, say 'Open Source'? +This is where the group sharing feature can be of use. + +To share 'Project Acme' with the 'Engineering' group, go to the project settings page for 'Project Acme' and use the left navigation menu to go to the 'Groups' section. + +![The 'Groups' section in the project settings screen](img/share_project_with_groups.png) + +Now you can add the 'Engineering' group with the maximum access level of your choice. +After sharing 'Project Acme' with 'Engineering', the project is listed on the group dashboard. + +!['Project Acme' is listed as a shared project for 'Engineering'](img/other_group_sees_shared_project.png) + +## Maximum access level + +!['Project Acme' is shared with 'Engineering' with a maximum access level of 'Developer'](img/max_access_level.png) + +In the screenshot above, the maximum access level of 'Developer' for members from 'Engineering' means that users with higher access levels in 'Engineering' ('Master' or 'Owner') will only have 'Developer' access to 'Project Acme'. + +## Share project with group lock (EES/EEP) + +In [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/) +it is possible to prevent projects in a group from [sharing +a project with another group](../members/share_project_with_groups.md). +This allows for tighter control over project access. + +Learn more about [Share with group lock](https://docs.gitlab.com/ee/user/group/index.html#share-with-group-lock-ees-eep). diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 925bbf76d49..707731ccfed 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -22,8 +22,7 @@ - [Protected branches](../user/project/protected_branches.md) - [Protected tags](../user/project/protected_tags.md) - [Quick Actions](../user/project/quick_actions.md) -- [Sharing a project with a group](share_with_group.md) -- [Share projects with other groups](share_projects_with_other_groups.md) +- [Sharing projects with groups](../user/project/members/share_project_with_groups.md) - [Time tracking](time_tracking.md) - [Web Editor](../user/project/repository/web_editor.md) - [Releases](releases.md) diff --git a/doc/workflow/groups/max_access_level.png b/doc/workflow/groups/max_access_level.png deleted file mode 100644 index 63f33f9d91d..00000000000 Binary files a/doc/workflow/groups/max_access_level.png and /dev/null differ diff --git a/doc/workflow/groups/other_group_sees_shared_project.png b/doc/workflow/groups/other_group_sees_shared_project.png deleted file mode 100644 index 67af27043eb..00000000000 Binary files a/doc/workflow/groups/other_group_sees_shared_project.png and /dev/null differ diff --git a/doc/workflow/groups/share_project_with_groups.png b/doc/workflow/groups/share_project_with_groups.png deleted file mode 100644 index 3cb4796f9f7..00000000000 Binary files a/doc/workflow/groups/share_project_with_groups.png and /dev/null differ diff --git a/doc/workflow/share_projects_with_other_groups.md b/doc/workflow/share_projects_with_other_groups.md index 40d756bc199..2eb4d24958a 100644 --- a/doc/workflow/share_projects_with_other_groups.md +++ b/doc/workflow/share_projects_with_other_groups.md @@ -1,32 +1 @@ -# Share Projects with other Groups - -You can share projects with other groups. This makes it possible to add a group of users -to a project with a single action. - -## Groups as collections of users - -Groups are used primarily to [create collections of projects](../user/group/index.md), but you can also -take advantage of the fact that groups define collections of _users_, namely the group -members. - -## Sharing a project with a group of users - -The primary mechanism to give a group of users, say 'Engineering', access to a project, -say 'Project Acme', in GitLab is to make the 'Engineering' group the owner of 'Project -Acme'. But what if 'Project Acme' already belongs to another group, say 'Open Source'? -This is where the group sharing feature can be of use. - -To share 'Project Acme' with the 'Engineering' group, go to the project settings page for 'Project Acme' and use the left navigation menu to go to the 'Groups' section. - -![The 'Groups' section in the project settings screen](groups/share_project_with_groups.png) - -Now you can add the 'Engineering' group with the maximum access level of your choice. -After sharing 'Project Acme' with 'Engineering', the project is listed on the group dashboard. - -!['Project Acme' is listed as a shared project for 'Engineering'](groups/other_group_sees_shared_project.png) - -## Maximum access level - -!['Project Acme' is shared with 'Engineering' with a maximum access level of 'Developer'](groups/max_access_level.png) - -In the screenshot above, the maximum access level of 'Developer' for members from 'Engineering' means that users with higher access levels in 'Engineering' ('Master' or 'Owner') will only have 'Developer' access to 'Project Acme'. +This document was moved to [../user/project/members/share_project_with_groups.md](../user/project/members/share_project_with_groups.md) diff --git a/doc/workflow/share_with_group.md b/doc/workflow/share_with_group.md index 3b7690973cb..2eb4d24958a 100644 --- a/doc/workflow/share_with_group.md +++ b/doc/workflow/share_with_group.md @@ -1,13 +1 @@ -# Sharing a project with a group - -If you want to share a single project in a group with another group, -you can do so easily. By setting the permission you can quickly -give a select group of users access to a project in a restricted manner. - -In a project go to the project settings -> groups. - -Now you can select a group that you want to share this project with and with -which maximum access level. Users in that group are able to access this project -with their set group access level, up to the maximum level that you've set. - -![Share a project with a group](share_with_group.png) +This document was moved to [../user/project/members/share_project_with_groups.md](../user/project/members/share_project_with_groups.md) -- cgit v1.2.1