summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-20 12:16:08 +0000
committerRémy Coutable <remy@rymai.me>2017-01-20 12:16:08 +0000
commit4b7e8f257074aa5af3816817d8d74d7ceb399b8a (patch)
tree7f5993bb8519d315886302c51e562bd7139da8e3 /doc/integration
parent491f1375fc055805c623a3079a383de988689f3d (diff)
parent63e8dc8a76184ff76feb9c3f4c21d3180edd218c (diff)
downloadgitlab-ce-4b7e8f257074aa5af3816817d8d74d7ceb399b8a.tar.gz
Merge branch '25851-document-token-scopes' into 'master'
Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/oauth_provider.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index 0c53584d201..af8a1c4e5ed 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -74,8 +74,10 @@ in the **Authorized applications** section under **Profile Settings > Applicatio
---
-As you can see, the default scope `api` is used, which is the only scope that
-GitLab supports so far. At any time you can revoke any access by just clicking
-**Revoke**.
+GitLab's OAuth applications support scopes, which allow various actions that any given
+application can perform. Although there are only two scopes available at the
+moment – `read_user` and `api` – the groundwork has been laid to add more scopes easily.
+
+At any time you can revoke any access by just clicking **Revoke**.
[oauth]: http://oauth.net/2/ "OAuth website"