diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-18 19:04:31 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-18 19:04:31 -0500 |
| commit | 41529b925437b20206d00ea0e1fd82b144b8e513 (patch) | |
| tree | 154bd420d5fdc6fd4c60d6155f3081e3a419e850 /doc/api | |
| parent | 1f3a0d52a36fda712ff07bc0ad71d44146c1953b (diff) | |
| parent | c5aa31c83145366d88ce6d8d91e68467cf5baed4 (diff) | |
| download | gitlab-ce-41529b925437b20206d00ea0e1fd82b144b8e513.tar.gz | |
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/oauth2.md | 2 | ||||
| -rw-r--r-- | doc/api/session.md | 2 |
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. --- |