summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaren Carias <karen@gitlab.com>2015-07-30 13:20:10 -0700
committerkaren Carias <karen@gitlab.com>2015-07-30 13:20:10 -0700
commit168f10febaab7ec1590ed8a1ba2771b534ae9c22 (patch)
tree85fb21d8019bff164cd76203bb2d771510c1dd70
parent25d9a7f506354a58b93a68814530632670af1579 (diff)
downloadgitlab-ce-168f10febaab7ec1590ed8a1ba2771b534ae9c22.tar.gz
added new doc about adding users and members
-rw-r--r--doc/permissions/permissions.md3
-rw-r--r--doc/workflow/README.md1
-rw-r--r--doc/workflow/add-user/add-user.md25
-rw-r--r--doc/workflow/add-user/images/add-members.pngbin0 -> 2361 bytes
-rw-r--r--doc/workflow/add-user/images/members.pngbin0 -> 8295 bytes
-rw-r--r--doc/workflow/add-user/images/new-member.pngbin0 -> 12038 bytes
-rw-r--r--doc/workflow/add-user/images/select-project.pngbin0 -> 4042 bytes
7 files changed, 29 insertions, 0 deletions
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index e81432c600f..e6185472dab 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 or member, you can follow the [Project users and members
+documentation](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..139f4db7d57 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 and members](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..1693dd6e527
--- /dev/null
+++ b/doc/workflow/add-user/add-user.md
@@ -0,0 +1,25 @@
+# Project Users and Members
+
+You can add or import members to your projects. You can also give them different access
+levels.
+
+You should have 'master' or 'owner' permissions to add or import a new member to your
+project.
+
+To add or import a new member, 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 member, select the user and the [permission level](doc/permissions/permissions.md) that you'd like to
+give the member:
+
+![Add or Import](images/new-member.png)
+
+If you are importing a member, 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
new file mode 100644
index 00000000000..2805c5764a5
--- /dev/null
+++ b/doc/workflow/add-user/images/add-members.png
Binary files differ
diff --git a/doc/workflow/add-user/images/members.png b/doc/workflow/add-user/images/members.png
new file mode 100644
index 00000000000..f1797b95f67
--- /dev/null
+++ b/doc/workflow/add-user/images/members.png
Binary files differ
diff --git a/doc/workflow/add-user/images/new-member.png b/doc/workflow/add-user/images/new-member.png
new file mode 100644
index 00000000000..d500daea56e
--- /dev/null
+++ b/doc/workflow/add-user/images/new-member.png
Binary files differ
diff --git a/doc/workflow/add-user/images/select-project.png b/doc/workflow/add-user/images/select-project.png
new file mode 100644
index 00000000000..dd3844edff8
--- /dev/null
+++ b/doc/workflow/add-user/images/select-project.png
Binary files differ