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-11-15 03:10:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-15 03:10:51 +0300
commitd9749000e7835a56d960b4768abe783dca37f37e (patch)
tree1899ba4f5586ffb45e26162c45c6df2d3553dd42 /doc/user
parent4b5042946065b750131e51790b84fe4a5aa7aa02 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/permissions.md3
-rw-r--r--doc/user/profile/account/two_factor_authentication.md3
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index dd129cfce49..f87603895ec 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -230,7 +230,8 @@ The following table lists project permissions available for each role:
[project visibility](../public_access/public_access.md) is set to private.
1. Attached design files are moved together with the issue even if the user doesn't have the
Developer role.
-1. Guest users can set metadata (for example, labels, assignees, or milestones) when creating an issue.
+1. Guest users can only set metadata (for example, labels, assignees, or milestones)
+ when creating an issue. They cannot change the metadata on existing issues.
1. In GitLab 14.5 or later, Guests are not allowed to [create incidents](../operations/incident_management/incidents.md#incident-creation).
## Project features permissions
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index db079992136..e4e7e7b9c1a 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -238,6 +238,9 @@ GitLab officially only supports [YubiKey](https://www.yubico.com/products/)
U2F devices, but users have successfully used [SoloKeys](https://solokeys.com/)
or [Google Titan Security Key](https://cloud.google.com/titan-security-key).
+NOTE:
+2FA must be configured before U2F.
+
The U2F workflow is [supported by](https://caniuse.com/#search=U2F) the
following desktop browsers: