summaryrefslogtreecommitdiff
path: root/doc/administration/auth
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:28 +0000
commitbe2f4c5788975597dd7be1c8a3525549770c1216 (patch)
tree083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/administration/auth
parent2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff)
downloadgitlab-ce-be2f4c5788975597dd7be1c8a3525549770c1216.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r--doc/administration/auth/smartcard.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md
index 6aa79200f4a..8986a9866e7 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -25,10 +25,11 @@ GitLab supports two authentication methods:
### Authentication against a local database with X.509 certificates
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/726) in
-[GitLab Premium](https://about.gitlab.com/pricing/) 11.6 as an experimental
-feature. Smartcard authentication against local databases may change or be
-removed completely in future releases.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/726) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.6 as an experimental feature.
+
+CAUTION: **Caution:**
+Smartcard authentication against local databases may change or be removed completely in future
+releases.
Smartcards with X.509 certificates can be used to authenticate with GitLab.