diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-12-08 00:17:44 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-08 11:12:36 +0100 |
commit | 45ab743a6eeeee79fa21cad1aabf99129207f0fd (patch) | |
tree | b60195e5289bd6f977f1067f56629572cd8bf364 /changelogs | |
parent | ead325582d418c14356de240c6c18c30f711f291 (diff) | |
download | gitlab-ce-45ab743a6eeeee79fa21cad1aabf99129207f0fd.tar.gz |
Merge branch '24537-reenable-private-token-with-sudo' into 'master'
Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin.
Closes #24537
See merge request !7615
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/24537-reenable-private-token-with-sudo.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml b/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml new file mode 100644 index 00000000000..9fbbaeb914d --- /dev/null +++ b/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml @@ -0,0 +1,5 @@ +--- +title: Reenables /user API request to return private-token if user is admin and request + is made with sudo +merge_request: 7615 +author: |