diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-12-08 00:17:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-12-08 00:17:44 +0000 |
| commit | cf2206eb2b16d12a1d9c18d47fc2105fbb650d33 (patch) | |
| tree | 00f4f63354cd9664b1aa4e8d40403dc95d00fbd6 /changelogs/unreleased/23696-fix-diff-view-highlighting.yml | |
| parent | e7b045eadaf315dc2ae4fc079af5d1199d3e5d25 (diff) | |
| parent | 3ed96afc47c481db4f8c0a6581602abaee920808 (diff) | |
| download | gitlab-ce-cf2206eb2b16d12a1d9c18d47fc2105fbb650d33.tar.gz | |
Merge branch '24537-reenable-private-token-with-sudo' into 'master'
Reenables /user API request to return private-token if user is admin and requested with sudo
## What does this MR do?
Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin.
## Screenshots (if relevant)
Without **sudo**:
With **sudo**:
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24537
See merge request !7615
Diffstat (limited to 'changelogs/unreleased/23696-fix-diff-view-highlighting.yml')
0 files changed, 0 insertions, 0 deletions