diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 15:06:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 15:06:40 +0300 |
| commit | 0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (patch) | |
| tree | 9ff7dd7b21a3f9642a8fbb45c922f71a433faf02 /doc/administration/auth | |
| parent | a048261403ea7e12992ccffe704f0779235712d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
| -rw-r--r-- | doc/administration/auth/smartcard.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md index 85ed4355e80..1088d1446fd 100644 --- a/doc/administration/auth/smartcard.md +++ b/doc/administration/auth/smartcard.md @@ -4,6 +4,10 @@ type: reference # Smartcard authentication **(PREMIUM ONLY)** +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/33669) in GitLab 12.6, +if a user has a pre-existing username and password, they can still use that to log +in by default. However, this can be disabled. + GitLab supports authentication using smartcards. ## Authentication methods |