summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-04-07 17:44:46 -0300
committerFelipe Artur <felipefac@gmail.com>2016-04-18 11:12:28 -0300
commit7d54e721da0ccd21f0150bbb6ab60b51970033c2 (patch)
treed1667a85da7c0b155416b62839c6b19df76eb958
parent09c8cf9de68c5d6f1250d6717b00f3b7e2008d3f (diff)
downloadgitlab-ce-7d54e721da0ccd21f0150bbb6ab60b51970033c2.tar.gz
Insert instructions in admin page and permissions document
-rw-r--r--app/views/admin/application_settings/_form.html.haml4
-rw-r--r--doc/permissions/permissions.md7
2 files changed, 10 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 555aea554f0..37b07c348d4 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -26,7 +26,9 @@
.btn-group{ data: data_attrs }
- restricted_level_checkboxes('restricted-visibility-help').each do |level|
= level
- %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets
+ %span.help-block#restricted-visibility-help
+ Selected levels cannot be used by non-admin users for projects or snippets.
+ If public level is restricted user profiles are not accessible to not logged users.
.form-group
= f.label :import_sources, class: 'control-label col-sm-2'
.col-sm-10
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index 6219693b8a8..f8cfd2898f0 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -93,3 +93,10 @@ An administrator can flag a user as external [through the API](../api/users.md)
or by checking the checkbox on the admin panel. As an administrator, navigate
to **Admin > Users** to create a new user or edit an existing one. There, you
will find the option to flag the user as external.
+
+## Restricted visibility levels
+
+Visibility levels can be restricted in admin settings page by administrator, when
+restricting a visibility level groups, projects and snippets are not allowed to be
+created with that visibility setting. If the public visibility level is restricted
+user profiles are accessible to not logged users.