diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-06 15:11:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-06 15:11:09 +0300 |
commit | e9aabbc4b5c80a569ce7e5909bd9d8def11b7a1b (patch) | |
tree | 2bc9ed254deba51c4041c1ee2fb8dcc7bd3dfaad /doc/user | |
parent | 08608c8e9e9821858dd2f452a3c9ebfb945ab69f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/permissions.md | 3 | ||||
-rw-r--r-- | doc/user/project/pages/index.md | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 87ac456d8c3..2594effe333 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -122,7 +122,7 @@ The following table lists project permissions available for each role: | [License Scanning](compliance/license_scanning_of_cyclonedx_files/index.md):<br>View License list | | ✓ | ✓ | ✓ | ✓ | | [License approval policies](../user/compliance/license_approval_policies.md):<br>Manage license policy | | | | ✓ | ✓ | | [Merge requests](project/merge_requests/index.md):<br>Assign reviewer | | ✓ | ✓ | ✓ | ✓ | -| [Merge requests](project/merge_requests/index.md):<br>See list | | ✓ | ✓ | ✓ | ✓ | +| [Merge requests](project/merge_requests/index.md):<br>View list | (25) | ✓ | ✓ | ✓ | ✓ | | [Merge requests](project/merge_requests/index.md):<br>Apply code change suggestions | | | ✓ | ✓ | ✓ | | [Merge requests](project/merge_requests/index.md):<br>Approve (8) | | | ✓ | ✓ | ✓ | | [Merge requests](project/merge_requests/index.md):<br>Assign | | | ✓ | ✓ | ✓ | @@ -250,6 +250,7 @@ The following table lists project permissions available for each role: 22. You must have permission to [view the epic](group/epics/manage_epics.md#who-can-view-an-epic). 23. In GitLab 15.9 and later, users with the Guest role and an Ultimate license can view private repository content if an administrator (on self-managed) or group owner (on GitLab.com) gives those users permission. The administrator or group owner can create a [custom role](custom_roles.md) through the API and assign that role to the users. 24. In GitLab 16.4 the ability for `Developers` to change the status of a vulnerability (`admin_vulnerability`) was [deprecated](../update/deprecations.md#deprecate-change-vulnerability-status-from-the-developer-role). The `admin_vulnerability` permission will be removed, by default, from all `Developer` roles in GitLab 17.0. +25. Members with the Guest role can view the list of MRs in public projects. Private projects restrict Guests from viewing MR lists. <!-- markdownlint-enable MD029 --> diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md index 60a5a9dee63..61024b0df62 100644 --- a/doc/user/project/pages/index.md +++ b/doc/user/project/pages/index.md @@ -175,7 +175,7 @@ To enable multiple GitLab Pages deployments: 1. On the left sidebar, select **Search or go to** and find your project. 1. Select **Deploy > Pages**. -1. Select **Use multiple versions**. +1. Select **Use multiple deployments**. ### Path clash |