summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-16 17:38:41 +0000
committerRémy Coutable <remy@rymai.me>2016-12-16 17:38:41 +0000
commitca6bf62ec14a37bf13f670ff7f62a4c12309fea5 (patch)
treec70c694a1aa5541f904e6946c135d78d2c282601 /changelogs
parent3487551966ddad57111e34284245ed9074c024c5 (diff)
parenteb434b15ebbc7d0b7ed79bb2daa45601e3c918ca (diff)
downloadgitlab-ce-ca6bf62ec14a37bf13f670ff7f62a4c12309fea5.tar.gz
Merge branch '20492-access-token-scopes' into 'master'
Resolve "Add a doorkeeper scope suitable for authentication" ## What does this MR do? - Add a single new scope (in addition to the `api` scope we've had) - `read_user` - Allow creating OAuth applications and Personal access tokens with a scope selected - Enforce scopes in the API ## What are the relevant issue numbers? - Closes #20492 - EE counterpart for this MR: gitlab-org/gitlab-ee!946 See merge request !5951
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/20492-access-token-scopes.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/20492-access-token-scopes.yml b/changelogs/unreleased/20492-access-token-scopes.yml
new file mode 100644
index 00000000000..a9424ded662
--- /dev/null
+++ b/changelogs/unreleased/20492-access-token-scopes.yml
@@ -0,0 +1,4 @@
+---
+title: Add scopes for personal access tokens and OAuth tokens
+merge_request: 5951
+author: