summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-11-20 11:53:22 +0100
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-20 11:53:22 +0100
commit9cbbc53fa4ef1ac0e45ca3b0e0ec2d226b3d8f73 (patch)
tree1ec57c11d9787c8e71bc5b145c055ac24b91ee68
parent4ce0ef0ec5d2582de19950e650ba8305db7c190e (diff)
downloadgitlab-ce-docs/pages-access-control.tar.gz
Make Pages visibility list clearerdocs/pages-access-control
-rw-r--r--doc/user/permissions.md2
-rw-r--r--doc/user/project/pages/introduction.md27
-rw-r--r--doc/user/project/settings/img/sharing_and_permissions_settings.pngbin45943 -> 46275 bytes
3 files changed, 14 insertions, 15 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 059c8063b0f..c4a2d5f66e5 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -95,7 +95,7 @@ The following table depicts the various user permission levels in a project.
| Manage GitLab Pages | | | | ✓ | ✓ |
| Manage GitLab Pages domains and certificates | | | | ✓ | ✓ |
| Remove GitLab Pages | | | | | ✓ |
-| View GitLab Pages protected by [access control](./project/pages/introduction.md#gitlab-pages-access-control-core-only) | ✓ | ✓ | ✓ | ✓ | ✓ |
+| View GitLab Pages protected by [access control](project/pages/introduction.md#gitlab-pages-access-control-core-only) | ✓ | ✓ | ✓ | ✓ | ✓ |
| Manage clusters | | | | ✓ | ✓ |
| Manage license policy **[ULTIMATE]** | | | | ✓ | ✓ |
| Edit comments (posted by any user) | | | | ✓ | ✓ |
diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md
index f68cf25c09a..9f9b64ec20d 100644
--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
@@ -446,35 +446,34 @@ See also: [GitLab Pages from A to Z: Part 1 - Static sites and GitLab Pages doma
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33422) in GitLab 11.5.
NOTE: **Note:**
-GitLab Pages access control is not activated on GitLab.com. Follow this
-[issue]() for more information.
+GitLab Pages access control is not activated on GitLab.com.
You can enable Pages access control on your project, so that only
[members of your project](../../permissions.md#project-members-permissions)
-at least Guest) can access your website:
+(at least Guest) can access your website:
-1. Navigate to your project's **Settings > General > Permissions**.
-1. Toggle the "Pages" button to enable the access control.
+1. Navigate to your project's **Settings > General > Permissions**.
+1. Toggle the **Pages** button to enable the access control.
NOTE: **Note:**
If you don't see the toggle button, that means that it's not enabled.
Ask your administrator to [enable it](../../../administration/pages/index.md#access-control).
-1. Depending on the visibility of your project, you can also choose who gets to
- have access:
+1. The Pages access control dropdown allows you to set who can view pages hosted
+ with GitLab Pages, depending on your project's visibility:
- - If your project is public:
- - **Everyone with access**: Everyone inside and outside of GitLab will be able to browse the website.
+ - If your project is private:
- **Only project members**: Only project members will be able to browse the website.
+ - **Everyone**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
- If your project is internal:
- - **Everyone with access**: Everyone inside GitLab will be able to browse the website.
- **Only project members**: Only project members will be able to browse the website.
- - **Everyone**: Everyone inside and outside of GitLab will be able to browse the website.
- - If your project is private:
- - **Everyone**: Everyone inside and outside of GitLab will be able to browse the website.
+ - **Everyone with access**: Everyone logged into GitLab will be able to browse the website, no matter their project membership.
+ - **Everyone**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
+ - If your project is public:
- **Only project members**: Only project members will be able to browse the website.
+ - **Everyone with access**: Everyone, both logged into and logged out of GitLab, will be able to browse the website, no matter their project membership.
-1. Click **Save changes**.
+1. Click **Save changes**.
---
diff --git a/doc/user/project/settings/img/sharing_and_permissions_settings.png b/doc/user/project/settings/img/sharing_and_permissions_settings.png
index 88b730bc724..6cb89c6ea1d 100644
--- a/doc/user/project/settings/img/sharing_and_permissions_settings.png
+++ b/doc/user/project/settings/img/sharing_and_permissions_settings.png
Binary files differ