summaryrefslogtreecommitdiff
path: root/doc/user/project/pages/introduction.md
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-11-21 10:35:54 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-11-21 10:35:54 +0000
commitd55650f045335f52ad833b5ba00990549bb032f5 (patch)
treedde3529f894604b7f0487ff5a83dd4bfb69b677a /doc/user/project/pages/introduction.md
parent2133baaf9944da24859e54bb68d86f8cf6f89d28 (diff)
parent98fd36274a530423399a9a4a0920e48ab82147cd (diff)
downloadgitlab-ce-54282-tooltip-stuck.tar.gz
Merge branch 'master' into 54282-tooltip-stuck54282-tooltip-stuck
* master: (24 commits) Adds a PHILOSOPHY.md Externalize strings from `/app/views/abuse_reports` Fix Issuable container element selector for shortcuts handling Enable Rubocop on lib/gitlab Add user docs for Pages access control Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 Align issue status label and confidential icon Externalize strings from `/app/views/repository_check_mailer` Remove instances of `@extend .monospace` Resolve "The reply shortcut can add any text of the page to the "comment" text area" Upgrade escape_utils to 1.2.1 Add dedicated runner tags to assets job Upgrade gitlab eslint config to latest Fix broken karma specs Disable conflicting eslint rules Prettify all the things Upgrade prettier to 1.15.2 Added a test for open merge request files Update CHANGELOG.md for 11.4.7 Open first 10 merge request files in IDE ...
Diffstat (limited to 'doc/user/project/pages/introduction.md')
-rw-r--r--doc/user/project/pages/introduction.md40
1 files changed, 40 insertions, 0 deletions
diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md
index fe4d15adfa1..9f9b64ec20d 100644
--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
@@ -441,6 +441,46 @@ The rest of the guide still applies.
See also: [GitLab Pages from A to Z: Part 1 - Static sites and GitLab Pages domains](getting_started_part_one.md#gitlab-pages-domain).
+## GitLab Pages access control **[CORE ONLY]**
+
+> [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.
+
+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:
+
+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. 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 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:
+ - **Only project members**: Only project members 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**.
+
+---
+
+The next time someone tries to access your website and the access control is
+enabled, they will be presented with a page to sign into GitLab and verify they
+can access the website.
+
## Limitations
When using Pages under the general domain of a GitLab instance (`*.example.io`),