summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-11 13:02:30 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-11 13:02:30 +0000
commitf81532b5b929d5fa8fdf72a71eb036b0cf27735b (patch)
tree6af2a80b9bab4cc3da23aad9358a68830fb90970
parentb883d94f969e73a55b83e142510262779f068c84 (diff)
parent39c78b71c1780c6f749f21edef4de0ac94ca9c96 (diff)
downloadgitlab-ce-f81532b5b929d5fa8fdf72a71eb036b0cf27735b.tar.gz
Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq
-rw-r--r--app/views/help/permissions.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml
index bab1e7c0a41..df35f41fc90 100644
--- a/app/views/help/permissions.html.haml
+++ b/app/views/help/permissions.html.haml
@@ -1,6 +1,8 @@
= 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.
+ %p.light If a user is a GitLab administrator they receive all permissions.
%hr
%h4 Project: