summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-04-01 04:28:56 +0000
committerEvan Read <eread@gitlab.com>2019-04-01 04:28:56 +0000
commit093629fedc43e8b481c6626765e3fcf0603add17 (patch)
tree2b2cda50e131b26a8ac5a09677c9f0fb3693946c
parente08c693babaf1a774061ce2bd185946f4717e8ec (diff)
parent72a033ffb7ad106d690bdd970568299077571a67 (diff)
downloadgitlab-ce-093629fedc43e8b481c6626765e3fcf0603add17.tar.gz
Merge branch 'patch-31' into 'master'
Clarify that personal access token should be sent as password for authentication. See merge request gitlab-org/gitlab-ce!22603
-rw-r--r--doc/user/profile/personal_access_tokens.md7
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index 3a4d09c35d9..52b4a72e688 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -5,12 +5,9 @@
Personal access tokens are the preferred way for third party applications and scripts to
authenticate with the [GitLab API][api], if using [OAuth2](../../api/oauth2.md) is not practical.
-You can also use them to authenticate against Git over HTTP. They are the only
-accepted method of authentication when you have
-[Two-Factor Authentication (2FA)][2fa] enabled.
+You can also use personal access tokens to authenticate against Git over HTTP or SSH. They must be used when you have [Two-Factor Authentication (2FA)][2fa] enabled. Authenticate with a token in place of your password.
-Once you have your token, [pass it to the API][usage] using either the
-`private_token` parameter or the `Private-Token` header.
+To make [authenticated requests to the API][usage], use either the `private_token` parameter or the `Private-Token` header.
The expiration of personal access tokens happens on the date you define,
at midnight UTC.