From 6cc3bb0f8fe292001c80c3a14cdc21952dd50c5f Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Fri, 11 Oct 2013 10:40:22 +0200 Subject: Explain how group and project permissions interact. --- app/views/help/permissions.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index bab1e7c0a41..5dbd6790134 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -1,6 +1,7 @@ = render layout: 'help/layout' do %h3.page-title Permissions - %p.light User has different abilities depends on access level he has in particular group or project + %p.light Users have different abilities depending on the access level they have in particular group or project. + %p.light If a user is both in a project group and in the project itself the highest permission level is used. %hr %h4 Project: -- cgit v1.2.1 From 39c78b71c1780c6f749f21edef4de0ac94ca9c96 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Fri, 11 Oct 2013 12:15:18 +0200 Subject: Add information about admin. --- app/views/help/permissions.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index 5dbd6790134..df35f41fc90 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -2,6 +2,7 @@ %h3.page-title Permissions %p.light Users have different abilities depending on the access level they have in particular group or project. %p.light If a user is both in a project group and in the project itself the highest permission level is used. + %p.light If a user is a GitLab administrator they receive all permissions. %hr %h4 Project: -- cgit v1.2.1