diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-05 10:55:25 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-05 10:55:25 +0000 |
| commit | 18718eb1047daa2733a7335787f66858375e0677 (patch) | |
| tree | 82a3f37e783b6fc5304862b27c3af42b903c65de | |
| parent | 8ceb3dc3417baf8837b46cfc1d5207efe848d2c3 (diff) | |
| parent | 01ae0cacc8660be5167a15003acd67c43fa16714 (diff) | |
| download | gitlab-ce-18718eb1047daa2733a7335787f66858375e0677.tar.gz | |
Merge branch 'docs/gitlab-pages-permissions' into 'master'
Add access controlled pages entry to permissions table
See merge request gitlab-org/gitlab-ce!22798
| -rw-r--r-- | doc/user/permissions.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 4359592905d..1fd230a41aa 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -95,6 +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](../administration/pages/index.md#access-control) | ✓ | ✓ | ✓ | ✓ | ✓ | | Manage clusters | | | | ✓ | ✓ | | Manage license policy **[ULTIMATE]** | | | | ✓ | ✓ | | Edit comments (posted by any user) | | | | ✓ | ✓ | @@ -206,7 +207,7 @@ They will, like usual users, receive a role in the project or group with all the abilities that are mentioned in the table above. They cannot however create groups or projects, and they have the same access as logged out users in all other cases. - + 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 @@ -217,7 +218,7 @@ by an administrator under **Admin > Application Settings**. ### Default internal users -The "Internal users" field allows specifying an e-mail address regex pattern to identify default internal users. +The "Internal users" field allows specifying an e-mail address regex pattern to identify default internal users. New users whose email address matches the regex pattern will be set to internal by default rather than an external collaborator. |