diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2013-03-18 21:06:24 +0000 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2013-03-19 04:47:08 +0000 |
| commit | a15fe61fb041ae7c2704bde6d73c246b85d618f7 (patch) | |
| tree | 20788092f19c5ce28cc757fa8595361f114e4e12 | |
| parent | 28e7d1a8bf3ef172331125cf56d92af85ea5e8b2 (diff) | |
| download | gitlab-ce-a15fe61fb041ae7c2704bde6d73c246b85d618f7.tar.gz | |
API docs updated
| -rw-r--r-- | doc/api/session.md | 12 | ||||
| -rw-r--r-- | doc/api/users.md | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/doc/api/session.md b/doc/api/session.md index c7e57aaca7a..d68788d5583 100644 --- a/doc/api/session.md +++ b/doc/api/session.md @@ -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 } ``` diff --git a/doc/api/users.md b/doc/api/users.md index 70a2449f2e1..c05bcb3e539 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -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 } ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 92191e4b6e3..42dae53b4d1 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -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 |