From b5e6ffa6165e9bbb999dd6b69e6161da80f66e7f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Fri, 24 Jul 2015 14:59:02 -0400 Subject: Add "Manage merge requests" permission to docs --- doc/permissions/permissions.md | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/permissions') diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index 70b7e17795d..e81432c600f 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -17,6 +17,7 @@ If a user is a GitLab administrator they receive all permissions. | Create code snippets | | ✓ | ✓ | ✓ | ✓ | | Manage issue tracker | | ✓ | ✓ | ✓ | ✓ | | Manage labels | | ✓ | ✓ | ✓ | ✓ | +| Manage merge requests | | | ✓ | ✓ | ✓ | | Create new merge request | | | ✓ | ✓ | ✓ | | Create new branches | | | ✓ | ✓ | ✓ | | Push to non-protected branches | | | ✓ | ✓ | ✓ | -- cgit v1.2.1 From 168f10febaab7ec1590ed8a1ba2771b534ae9c22 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 30 Jul 2015 13:20:10 -0700 Subject: added new doc about adding users and members --- doc/permissions/permissions.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/permissions') 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 | -- cgit v1.2.1 From e70901abe76b07d7d08c6687ec746ac0491ddf26 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 30 Jul 2015 13:26:10 -0700 Subject: typo --- doc/permissions/permissions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/permissions') diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index e6185472dab..029d446640d 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -6,8 +6,8 @@ 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). +To add or import a user or member, you can follow the [project users and members +documentation](doc/workflow/add-user/add-user.md). ## Project -- cgit v1.2.1 From 28cc6d9b9860fb38fc68d05c40d552d3a46e7ac8 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 3 Aug 2015 15:51:09 -0700 Subject: text fixed --- doc/permissions/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/permissions') diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md index 029d446640d..7a6a1958445 100644 --- a/doc/permissions/permissions.md +++ b/doc/permissions/permissions.md @@ -6,7 +6,7 @@ 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 +To add or import a user, you can follow the [project users and members documentation](doc/workflow/add-user/add-user.md). ## Project -- cgit v1.2.1