summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-30 13:00:11 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-30 13:00:11 +0000
commit2dc3348f5ac83fe39e79c5a2829bb8e54d702ff6 (patch)
treeb8b712de74856645d9c4a97faff47dbd7f6cde08
parentb9daced7a2814fa74a3f0dddf38858100678c6b1 (diff)
parent91a91557ce4aeeafa34856009359bb6c34e3e10e (diff)
downloadgitlab-ce-2dc3348f5ac83fe39e79c5a2829bb8e54d702ff6.tar.gz
Merge branch 'fix_oauth_doc' into 'master'
Fix a confusion in OAuth2 documentation ## What does this MR do? fixes confusion :) ## Why was this MR needed? Because no body wants to be confused :) See merge request !6563
-rw-r--r--doc/api/oauth2.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/oauth2.md b/doc/api/oauth2.md
index b34e8075775..5ef5e3f5744 100644
--- a/doc/api/oauth2.md
+++ b/doc/api/oauth2.md
@@ -1,4 +1,4 @@
-# GitLab as an OAuth2 client
+# GitLab as an OAuth2 provider
This document covers using the OAuth2 protocol to access GitLab.
@@ -112,7 +112,7 @@ You can do POST request to `/oauth/token` with parameters:
{
"grant_type" : "password",
"username" : "user@example.com",
- "password" : "sekret"
+ "password" : "secret"
}
```
@@ -130,8 +130,8 @@ For testing you can use the oauth2 ruby gem:
```
client = OAuth2::Client.new('the_client_id', 'the_client_secret', :site => "http://example.com")
-access_token = client.password.get_token('user@example.com', 'sekret')
+access_token = client.password.get_token('user@example.com', 'secret')
puts access_token.token
```
-[personal access tokens]: ./README.md#personal-access-tokens
+[personal access tokens]: ./README.md#personal-access-tokens \ No newline at end of file