diff options
author | Job van der Voort <job@gitlab.com> | 2015-08-04 11:46:47 +0300 |
---|---|---|
committer | Job van der Voort <job@gitlab.com> | 2015-08-04 11:46:47 +0300 |
commit | e9ba1185f23f7a4089384a1411a367735774e80c (patch) | |
tree | cbf779e9f84c0c89e5e5df8b3351024e0a2941ef /doc | |
parent | cc4405db7d90cbb25778b335138b1401f9060db6 (diff) | |
parent | c5a6c16dba66318ea7f36b368217a275f1dd24e8 (diff) |
Merge branch 'add-user' into 'master'
Added new doc about adding users and members
Added new doc in workflow about how to add users and members and I also linked it to "permissions".
See merge request !1916
Diffstat (limited to 'doc')
-rw-r--r-- | doc/permissions/permissions.md | 3 | ||||
-rw-r--r-- | doc/workflow/README.md | 1 | ||||
-rw-r--r-- | doc/workflow/add-user/add-user.md | 25 | ||||
-rw-r--r-- | doc/workflow/add-user/images/add-members.png | bin | 0 -> 2361 bytes | |||
-rw-r--r-- | doc/workflow/add-user/images/members.png | bin | 0 -> 8295 bytes | |||
-rw-r--r-- | doc/workflow/add-user/images/new-member.png | bin | 0 -> 12038 bytes | |||
-rw-r--r-- | doc/workflow/add-user/images/select-project.png | bin | 0 -> 4042 bytes |
7 files changed, 29 insertions, 0 deletions
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index e81432c600f..7a6a1958445 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -6,6 +6,9 @@ If a user is both in a project group and in the project itself, the highest perm If a user is a GitLab administrator they receive all permissions. +To add or import a user, you can follow the [project users and members +documentation](doc/workflow/add-user/add-user.md). + ## Project | Action | Guest | Reporter | Developer | Master | Owner | diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 1f39d02bdf3..3915198ad2a 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -10,6 +10,7 @@ - [Notification emails](notifications.md) - [Project Features](project_features.md) - [Project forking workflow](forking_workflow.md) +- [Project users](add-user/add-user.md) - [Protected branches](protected_branches.md) - [Web Editor](web_editor.md) - ["Work In Progress" Merge Requests](wip_merge_requests.md) diff --git a/doc/workflow/add-user/add-user.md b/doc/workflow/add-user/add-user.md new file mode 100644 index 00000000000..8c9b4f72631 --- /dev/null +++ b/doc/workflow/add-user/add-user.md @@ -0,0 +1,25 @@ +# Project users + +You can manage the groups and users and their access levels in all of your projects. You can also personalize the access level you give each user, per project. + +Here's how to add or import users to your projects. + +You should have 'master' or 'owner' permissions to add or import a new user +to your project. + +To add or import a user, go to your project and click on "Members" on the left side of your screen: + +![Members](images/members.png) + +Select "Add members" or "Import members" on the right side of your screen: + +![Add or Import](images/add-members.png) + +If you are adding a user, select the user and the [permission level](doc/permissions/permissions.md) that you'd like to +give the user: + +![Add or Import](images/new-member.png) + +If you are importing a user, follow the steps to select the project where you'd like to import the user from: + +![Add or Import](images/select-project.png) diff --git a/doc/workflow/add-user/images/add-members.png b/doc/workflow/add-user/images/add-members.png Binary files differnew file mode 100644 index 00000000000..2805c5764a5 --- /dev/null +++ b/doc/workflow/add-user/images/add-members.png diff --git a/doc/workflow/add-user/images/members.png b/doc/workflow/add-user/images/members.png Binary files differnew file mode 100644 index 00000000000..f1797b95f67 --- /dev/null +++ b/doc/workflow/add-user/images/members.png diff --git a/doc/workflow/add-user/images/new-member.png b/doc/workflow/add-user/images/new-member.png Binary files differnew file mode 100644 index 00000000000..d500daea56e --- /dev/null +++ b/doc/workflow/add-user/images/new-member.png diff --git a/doc/workflow/add-user/images/select-project.png b/doc/workflow/add-user/images/select-project.png Binary files differnew file mode 100644 index 00000000000..dd3844edff8 --- /dev/null +++ b/doc/workflow/add-user/images/select-project.png |