summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/user/membership.md41
-rw-r--r--doc/user/membership/add_a_user_to_a_group.md0
-rw-r--r--doc/user/membership/add_a_user_to_a_project.md0
-rw-r--r--doc/user/membership/import_users_from_another_project.md0
-rw-r--r--doc/user/membership/invite_users_using_their_email_address.md0
-rw-r--r--doc/user/membership/remove_a_user_from_a_group.md0
-rw-r--r--doc/user/membership/remove_a_user_from_a_project.md0
-rw-r--r--doc/user/membership/request_access_to_a_project_or_a_group.md0
-rw-r--r--doc/user/membership/set_an_expiration_date_on_memberships.md0
-rw-r--r--doc/user/permissions.md3
10 files changed, 43 insertions, 1 deletions
diff --git a/doc/user/membership.md b/doc/user/membership.md
new file mode 100644
index 00000000000..5870000ccd2
--- /dev/null
+++ b/doc/user/membership.md
@@ -0,0 +1,41 @@
+# Membership to projects and groups
+
+GitLab's [permission model][permissions] allows users to have different
+abilities depending on the access level they have in a particular group or
+project. To manage the membership of project users you need at least Master
+permission, whereas for groups you need to be an Owner.
+
+## Add a user to a project
+
+[Read more about adding a user to a project.](membership/add_a_user_to_a_project.md)
+
+## Remove a user from a project
+
+[Read more about removing a user from a project.](membership/remove_a_user_from_a_project.md)
+
+## Add a user to a group
+
+[Read more about adding a user to a group.](membership/add_a_user_to_a_group.md)
+
+## Remove a user from a group
+
+[Read more about removing a user from a group.](membership/remove_a_user_from_a_group.md)
+
+## Import users from another project
+
+[Read more about importing users from another project.](membership/import_users_from_another_project.md)
+
+## Invite users using their email address
+
+[Read more about inviting users using their email address.](membership/invite_users_using_their_email_address.md)
+
+## Request access to a project or a group
+
+[Read more about requesting access to a project or a group.](membership/request_access_to_a_project_or_a_group.md)
+
+## Set an expiration date on memberships
+
+[Read more about setting an expiration date on memberships.](membership/set_an_expiration_date_on_memberships.md)
+
+
+[permissions]: permissions.md
diff --git a/doc/user/membership/add_a_user_to_a_group.md b/doc/user/membership/add_a_user_to_a_group.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/add_a_user_to_a_group.md
diff --git a/doc/user/membership/add_a_user_to_a_project.md b/doc/user/membership/add_a_user_to_a_project.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/add_a_user_to_a_project.md
diff --git a/doc/user/membership/import_users_from_another_project.md b/doc/user/membership/import_users_from_another_project.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/import_users_from_another_project.md
diff --git a/doc/user/membership/invite_users_using_their_email_address.md b/doc/user/membership/invite_users_using_their_email_address.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/invite_users_using_their_email_address.md
diff --git a/doc/user/membership/remove_a_user_from_a_group.md b/doc/user/membership/remove_a_user_from_a_group.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/remove_a_user_from_a_group.md
diff --git a/doc/user/membership/remove_a_user_from_a_project.md b/doc/user/membership/remove_a_user_from_a_project.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/remove_a_user_from_a_project.md
diff --git a/doc/user/membership/request_access_to_a_project_or_a_group.md b/doc/user/membership/request_access_to_a_project_or_a_group.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/request_access_to_a_project_or_a_group.md
diff --git a/doc/user/membership/set_an_expiration_date_on_memberships.md b/doc/user/membership/set_an_expiration_date_on_memberships.md
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/doc/user/membership/set_an_expiration_date_on_memberships.md
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index c0dc80325b6..0ce08c9ad0b 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -46,7 +46,8 @@ The following table depicts the various user permission levels in a project.
| Remove a container registry image | | | ✓ | ✓ | ✓ |
| Create new environments | | | ✓ | ✓ | ✓ |
| Create new milestones | | | | ✓ | ✓ |
-| Add new team members | | | | ✓ | ✓ |
+| Add users as project members | | | | ✓ | ✓ |
+| Manage project members | | | | ✓ | ✓ |
| Push to protected branches | | | | ✓ | ✓ |
| Enable/disable branch protection | | | | ✓ | ✓ |
| Turn on/off protected branch push for devs| | | | ✓ | ✓ |