summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-10-12 20:59:03 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-10-12 20:59:03 +0000
commit3555252d808d7d939e1dd508962abe8d94cbd667 (patch)
tree7e1e83e761534033d01c7b4a32f5fffdc33ec77a /changelogs
parent8d47e9f8e13c2ca43520b348dde0424fe6460cc9 (diff)
parent3d744009ed3f27daefb5d898f6e8b848a3630928 (diff)
downloadgitlab-ce-3555252d808d7d939e1dd508962abe8d94cbd667.tar.gz
Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'
Issue JWT token with registry:catalog:* scope when requested by GitLab admin Closes #26763 and #18392 See merge request gitlab-org/gitlab-ce!14751
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml b/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml
new file mode 100644
index 00000000000..8918c42e3fb
--- /dev/null
+++ b/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml
@@ -0,0 +1,5 @@
+---
+title: Issue JWT token with registry:catalog:* scope when requested by GitLab admin
+merge_request: 14751
+author: Vratislav Kalenda
+type: added