kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

API docs updated

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/api/session.md
View file

@ -17,7 +17,17 @@ Parameters:
"email": "john@example.com",
"name": "John Smith",
"private_token": "dd34asd13as",
"blocked": false,
"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
}
```

5
doc/api/users.md
View file

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

2
lib/api/entities.rb
View file

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