summaryrefslogtreecommitdiff
path: root/doc/user/project/members
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/project/members')
-rw-r--r--doc/user/project/members/img/other_group_sees_shared_project.pngbin21154 -> 0 bytes
-rw-r--r--doc/user/project/members/img/other_group_sees_shared_project_v13_6.pngbin0 -> 291848 bytes
-rw-r--r--doc/user/project/members/img/share_project_with_groups.pngbin37405 -> 0 bytes
-rw-r--r--doc/user/project/members/img/share_project_with_groups_tab.pngbin36482 -> 0 bytes
-rw-r--r--doc/user/project/members/img/share_project_with_groups_tab_v13_6.pngbin0 -> 378257 bytes
-rw-r--r--doc/user/project/members/img/share_project_with_groups_v13_6.pngbin0 -> 395958 bytes
-rw-r--r--doc/user/project/members/index.md15
-rw-r--r--doc/user/project/members/share_project_with_groups.md25
8 files changed, 22 insertions, 18 deletions
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
deleted file mode 100644
index e4c93a13abb..00000000000
--- a/doc/user/project/members/img/other_group_sees_shared_project.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/members/img/other_group_sees_shared_project_v13_6.png b/doc/user/project/members/img/other_group_sees_shared_project_v13_6.png
new file mode 100644
index 00000000000..e6e3f8f043b
--- /dev/null
+++ b/doc/user/project/members/img/other_group_sees_shared_project_v13_6.png
Binary files 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
deleted file mode 100644
index 0907438cb84..00000000000
--- a/doc/user/project/members/img/share_project_with_groups.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/members/img/share_project_with_groups_tab.png b/doc/user/project/members/img/share_project_with_groups_tab.png
deleted file mode 100644
index fc489aae003..00000000000
--- a/doc/user/project/members/img/share_project_with_groups_tab.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/members/img/share_project_with_groups_tab_v13_6.png b/doc/user/project/members/img/share_project_with_groups_tab_v13_6.png
new file mode 100644
index 00000000000..7d83659ef7a
--- /dev/null
+++ b/doc/user/project/members/img/share_project_with_groups_tab_v13_6.png
Binary files differ
diff --git a/doc/user/project/members/img/share_project_with_groups_v13_6.png b/doc/user/project/members/img/share_project_with_groups_v13_6.png
new file mode 100644
index 00000000000..121e77671a3
--- /dev/null
+++ b/doc/user/project/members/img/share_project_with_groups_v13_6.png
Binary files differ
diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md
index c66103604ed..85cb139c45b 100644
--- a/doc/user/project/members/index.md
+++ b/doc/user/project/members/index.md
@@ -1,7 +1,7 @@
---
stage: none
group: unassigned
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Members of a project
@@ -53,7 +53,7 @@ that you'd like to give the user. Note that you can select more than one user.
![Give user permissions](img/add_user_give_permissions.png)
-Once done, hit **Add users to project** and they will be immediately added to
+Once done, select **Add users to project** and they are immediately added to
your project with the permissions you gave them above.
![List members](img/add_user_list_members.png)
@@ -71,7 +71,7 @@ In the dropdown menu, you can see only the projects you are Maintainer on.
![Import members from another project](img/add_user_import_members_from_another_project.png)
Select the one you want and hit **Import project members**. A flash message
-notifying you that the import was successful will appear, and the new members
+displays, notifying you that the import was successful, and the new members
are now in the project's members list. Notice that the permissions that they
had on the project you imported from are retained.
@@ -96,10 +96,13 @@ invitation, change their access level, or even delete them.
![Invite user members list](img/add_user_email_accept.png)
-Once the user accepts the invitation, they will be prompted to create a new
+While unaccepted, the system automatically sends reminder emails on the second, fifth,
+and tenth day after the invitation was initially sent.
+
+After the user accepts the invitation, they are prompted to create a new
GitLab account using the same e-mail address the invitation was sent to.
-Note: **Note:**
+NOTE:
Unaccepted invites are automatically deleted after 90 days.
## Project membership and requesting access
@@ -123,7 +126,7 @@ After access is requested:
Email is sent to the most recently active project maintainers.
- Any project maintainer can approve or decline the request on the members page.
-NOTE: **Note:**
+NOTE:
If a project does not have any maintainers, the notification is sent to the
most recently active owners of the project's group.
diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md
index 395f4353f47..edfe8ae3b5b 100644
--- a/doc/user/project/members/share_project_with_groups.md
+++ b/doc/user/project/members/share_project_with_groups.md
@@ -1,7 +1,7 @@
---
stage: none
group: unassigned
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
---
# Share Projects with other Groups
@@ -24,35 +24,36 @@ This is where the group sharing feature can be of use.
To share 'Project Acme' with the 'Engineering' group:
-1. For 'Project Acme' use the left navigation menu to go to **Members**
+1. For 'Project Acme' use the left navigation menu to go to **Members**.
- ![share project with groups](img/share_project_with_groups.png)
+ ![share project with groups](img/share_project_with_groups_tab_v13_6.png)
-1. Select the 'Share with group' tab
-1. Add the 'Engineering' group with the maximum access level of your choice
-1. Click **Share** to share it
+1. Select the **Invite group** tab.
+1. Add the 'Engineering' group with the maximum access level of your choice.
+1. Optionally, select an expiring date.
+1. Click **Invite**.
- ![share project with groups tab](img/share_project_with_groups_tab.png)
+ ![share project with groups tab](img/share_project_with_groups_tab_v13_6.png)
-1. After sharing 'Project Acme' with 'Engineering', the project will be listed
+1. 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)
+ !['Project Acme' is listed as a shared project for 'Engineering'](img/other_group_sees_shared_project_v13_6.png)
Note that you can only share a project with:
- groups for which you have an explicitly defined membership
- groups that contain a nested subgroup or project for which you have an explicitly defined role
-Admins are able to share projects with any group in the system.
+Administrators are able to share projects with any group in the system.
## Maximum access level
-In the example above, the maximum access level of 'Developer' for members from 'Engineering' means that users with higher access levels in 'Engineering' ('Maintainer' or 'Owner') will only have 'Developer' access to 'Project Acme'.
+In the example above, the maximum access level of 'Developer' for members from 'Engineering' means that users with higher access levels in 'Engineering' ('Maintainer' or 'Owner') only have 'Developer' access to 'Project Acme'.
## Sharing public project with private group
-When sharing a public project with a private group, owners and maintainers of the project will see the name of the group in the `members` page. Owners will also have the possibility to see members of the private group they don't have access to when mentioning them in the issue or merge request.
+When sharing a public project with a private group, owners and maintainers of the project see the name of the group in the `members` page. Owners also have the possibility to see members of the private group they don't have access to when mentioning them in the issue or merge request.
## Share project with group lock