API docs updated

This commit is contained in:
Alex Denisov 2013-03-18 21:06:24 +00:00
parent 28e7d1a8bf
commit a15fe61fb0
3 changed files with 17 additions and 2 deletions

View file

@ -17,7 +17,17 @@ Parameters:
"email": "john@example.com", "email": "john@example.com",
"name": "John Smith", "name": "John Smith",
"private_token": "dd34asd13as", "private_token": "dd34asd13as",
"blocked": false,
"created_at": "2012-05-23T08:00:58Z", "created_at": "2012-05-23T08:00:58Z",
"blocked": true "bio": null,
"skype": "",
"linkedin": "",
"twitter": "",
"dark_scheme": false,
"theme_id": 1
"is_admin": false,
"can_create_group" : true,
"can_create_team" : true,
"can_create_project" : true
} }
``` ```

View file

@ -154,6 +154,7 @@ GET /user
"username": "john_smith", "username": "john_smith",
"email": "john@example.com", "email": "john@example.com",
"name": "John Smith", "name": "John Smith",
"private_token": "dd34asd13as",
"blocked": false, "blocked": false,
"created_at": "2012-05-23T08:00:58Z", "created_at": "2012-05-23T08:00:58Z",
"bio": null, "bio": null,
@ -162,6 +163,10 @@ GET /user
"twitter": "", "twitter": "",
"dark_scheme": false, "dark_scheme": false,
"theme_id": 1 "theme_id": 1
"is_admin": false,
"can_create_group" : true,
"can_create_team" : true,
"can_create_project" : true
} }
``` ```

View file

@ -13,7 +13,7 @@ module Gitlab
expose :id, :username, :email, :name, :state, :created_at expose :id, :username, :email, :name, :state, :created_at
end end
class UserLogin < UserBasic class UserLogin < User
expose :private_token expose :private_token
expose :is_admin?, as: :is_admin expose :is_admin?, as: :is_admin
expose :can_create_group?, as: :can_create_group expose :can_create_group?, as: :can_create_group