Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-20 17:54:30 +0300
committerClement Ho <ClemMakesApps@gmail.com>2017-06-20 18:28:54 +0300
commitb5d6ef0eeb337c221a6a5a8594d7154c1fba8c26 (patch)
tree5da73a812823bcba8ef850864c1590a912645194 /doc
parent57682e8dee73f04832bec69e5fe21b0537072d39 (diff)
Merge branch '33260-allow-admins-to-list-admins' into 'master'
Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211
Diffstat (limited to 'doc')
-rw-r--r--doc/api/users.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 91ce4f6dac3..43d53756e44 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -62,6 +62,7 @@ GET /users
"avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg",
"web_url": "http://localhost:3000/john_smith",
"created_at": "2012-05-23T08:00:58Z",
+ "is_admin": false,
"bio": null,
"location": null,
"skype": "",
@@ -94,6 +95,7 @@ GET /users
"avatar_url": "http://localhost:3000/uploads/user/avatar/2/index.jpg",
"web_url": "http://localhost:3000/jack_smith",
"created_at": "2012-05-23T08:01:01Z",
+ "is_admin": false,
"bio": null,
"location": null,
"skype": "",
@@ -197,6 +199,7 @@ Parameters:
"avatar_url": "http://localhost:3000/uploads/user/avatar/1/index.jpg",
"web_url": "http://localhost:3000/john_smith",
"created_at": "2012-05-23T08:00:58Z",
+ "is_admin": false,
"bio": null,
"location": null,
"skype": "",