Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-17 03:10:14 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-17 03:10:14 +0300
commit541b6cf72fe31f266b1dac57c0da76967fecf38e (patch)
tree8619a54d719d6f44148fee34dcbe1997715a6474 /doc/user
parent419bd31155fdcb4344dfc7ca9c72d90e18d08dd7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/application_security/threat_monitoring/index.md3
-rw-r--r--doc/user/permissions.md4
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/user/application_security/threat_monitoring/index.md b/doc/user/application_security/threat_monitoring/index.md
index f642df3ce93..8e9125669db 100644
--- a/doc/user/application_security/threat_monitoring/index.md
+++ b/doc/user/application_security/threat_monitoring/index.md
@@ -227,7 +227,8 @@ By default, the list doesn't display resolved or dismissed alerts.
![Policy Alert List](img/threat_monitoring_policy_alert_list_v13_12.png)
-Clicking an alert's row will open the alert drawer that shows more details and allows a user to create an incident from the alert.
+Clicking an alert's row opens the alert drawer, which shows more information about the alert. A user
+can also create an incident from the alert in the alert drawer.
Clicking an alert's name takes the user to the [alert details page](../../../operations/incident_management/alerts.md#alert-details-page).
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 515a99e419a..245efc0e908 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -427,8 +427,8 @@ with the permissions described on the documentation on [auditor users permission
>[Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40942) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.4.
-Administrators can add members with a "minimal access" role to a parent group. Such users don't
-automatically have access to projects and subgroups underneath. To support such access, administrators must explicitly add these "minimal access" users to the specific subgroups/projects.
+Owners can add members with a "minimal access" role to a parent group. Such users don't
+automatically have access to projects and subgroups underneath. To support such access, owners must explicitly add these "minimal access" users to the specific subgroups/projects.
Users with minimal access can list the group in the UI and through the API. However, they cannot see
details such as projects or subgroups. They do not have access to the group's page or list any of its subgroups or projects.