Download as
Browse Code »

Commit a15fe61fb041ae7c2704bde6d73c246b85d618f7

Authored by Alex Denisov
1 parent 28e7d1a8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

API docs updated

Showing 3 changed files with 17 additions and 2 deletions   Show diff stats
doc/api/session.md
  Diff comments   View file @a15fe61
... ... @@ -17,7 +17,17 @@ Parameters:
17 17 "email": "john@example.com",
18 18 "name": "John Smith",
19 19 "private_token": "dd34asd13as",
  20 + "blocked": false,
20 21 "created_at": "2012-05-23T08:00:58Z",
21   - "blocked": true
  22 + "bio": null,
  23 + "skype": "",
  24 + "linkedin": "",
  25 + "twitter": "",
  26 + "dark_scheme": false,
  27 + "theme_id": 1
  28 + "is_admin": false,
  29 + "can_create_group" : true,
  30 + "can_create_team" : true,
  31 + "can_create_project" : true
22 32 }
23 33 ```
... ...
doc/api/users.md
  Diff comments   View file @a15fe61
... ... @@ -154,6 +154,7 @@ GET /user
154 154 "username": "john_smith",
155 155 "email": "john@example.com",
156 156 "name": "John Smith",
  157 + "private_token": "dd34asd13as",
157 158 "blocked": false,
158 159 "created_at": "2012-05-23T08:00:58Z",
159 160 "bio": null,
... ... @@ -162,6 +163,10 @@ GET /user
162 163 "twitter": "",
163 164 "dark_scheme": false,
164 165 "theme_id": 1
  166 + "is_admin": false,
  167 + "can_create_group" : true,
  168 + "can_create_team" : true,
  169 + "can_create_project" : true
165 170 }
166 171 ```
167 172  
... ...
lib/api/entities.rb
  Diff comments   View file @a15fe61
... ... @@ -13,7 +13,7 @@ module Gitlab
13 13 expose :id, :username, :email, :name, :state, :created_at
14 14 end
15 15  
16   - class UserLogin < UserBasic
  16 + class UserLogin < User
17 17 expose :private_token
18 18 expose :is_admin?, as: :is_admin
19 19 expose :can_create_group?, as: :can_create_group
... ...