summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-08-15 17:14:22 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-08-18 16:47:26 -0500
commitff6f0ada3fc4c4dc89c9f2f0d947099c2d14ae88 (patch)
treec582d25a87e96b28e0970705843c20350f49da5e /doc
parente2f9c87600e34a415d43c981e0182094b123771f (diff)
downloadgitlab-ce-ff6f0ada3fc4c4dc89c9f2f0d947099c2d14ae88.tar.gz
Added documentation and CHANGELOG item
Diffstat (limited to 'doc')
-rw-r--r--doc/api/oauth2.md2
-rw-r--r--doc/api/session.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md
index 16ef79617c0..0b0fc39ec7e 100644
--- a/doc/api/oauth2.md
+++ b/doc/api/oauth2.md
@@ -90,7 +90,7 @@ curl --header "Authorization: Bearer OAUTH-TOKEN" https://localhost:3000/api/v3/
## Deprecation Notice
-1. Starting in GitLab 9.0, the Resource Owner Password Credentials will be *disabled* for users with two-factor authentication turned on.
+1. Starting in GitLab 8.11, the Resource Owner Password Credentials has been *disabled* for users with two-factor authentication turned on.
2. These users can access the API using [personal access tokens] instead.
---
diff --git a/doc/api/session.md b/doc/api/session.md
index 9076c48b899..f776424023e 100644
--- a/doc/api/session.md
+++ b/doc/api/session.md
@@ -2,7 +2,7 @@
## Deprecation Notice
-1. Starting in GitLab 9.0, this feature will be *disabled* for users with two-factor authentication turned on.
+1. Starting in GitLab 8.11, this feature has been *disabled* for users with two-factor authentication turned on.
2. These users can access the API using [personal access tokens] instead.
---