summaryrefslogtreecommitdiff
path: root/doc/api/session.md
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-06-21 11:03:50 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-06-27 13:48:55 +0530
commitf7fc352b4a54c5b86a47a5e447aefbb40558a2cd (patch)
tree85c0741840f5d71e7e9e719706189c9d0ea4aa39 /doc/api/session.md
parent5804b6a0a28a20b1977ab89e04b15b85475b49e0 (diff)
downloadgitlab-ce-f7fc352b4a54c5b86a47a5e447aefbb40558a2cd.tar.gz
Add notices about disabling auth features for users with 2FA.2979-document-2fa-auth-changes
Diffstat (limited to 'doc/api/session.md')
-rw-r--r--doc/api/session.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/api/session.md b/doc/api/session.md
index 71e93d0bb0a..066a055702d 100644
--- a/doc/api/session.md
+++ b/doc/api/session.md
@@ -1,5 +1,12 @@
# Session
+## Deprecation Notice
+
+1. Starting in GitLab 9.0, this feature will be *disabled* for users with two-factor authentication turned on.
+2. These users can access the API using [personal access tokens] instead.
+
+---
+
You can login with both GitLab and LDAP credentials in order to obtain the
private token.
@@ -45,3 +52,5 @@ Example response:
"private_token": "9koXpg98eAheJpvBs5tK"
}
```
+
+[personal access tokens]: ./README.md#personal-access-tokens