diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-29 23:25:40 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-29 23:25:40 -0700 |
| commit | cd5685ca8ce14ff4dbff6ada5e5a8b90808ae3d1 (patch) | |
| tree | c77c33dfcac46fdc42391c63842267858492bbba | |
| parent | 56ddf93f8eae54e545260d40abe5f8bef1979fe1 (diff) | |
| parent | 07fd95f3840908018cb3712162a441e63409bc31 (diff) | |
| download | gitlab-ce-cd5685ca8ce14ff4dbff6ada5e5a8b90808ae3d1.tar.gz | |
Merge pull request #4115 from bke-drewb/apidocs
Update api docs and remove old attribute from User entity.
| -rw-r--r-- | doc/api/users.md | 16 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index ee5e98a016c..9dd35f4bca0 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -14,32 +14,32 @@ GET /users "username": "john_smith", "email": "john@example.com", "name": "John Smith", - "blocked": false, + "state": "active", "created_at": "2012-05-23T08:00:58Z", "bio": null, "skype": "", "linkedin": "", "twitter": "", - "dark_scheme": false, "extern_uid": "john.smith", "provider": "provider_name", "theme_id": 1 + "color_scheme_id": 2 }, { "id": 2, "username": "jack_smith", "email": "jack@example.com", "name": "Jack Smith", - "blocked": false, + "state": "blocked", "created_at": "2012-05-23T08:01:01Z", "bio": null, "skype": "", "linkedin": "", "twitter": "", - "dark_scheme": true, "extern_uid": "jack.smith", "provider": "provider_name", "theme_id": 1 + "color_scheme_id": 3 } ] ``` @@ -63,16 +63,16 @@ Parameters: "username": "john_smith", "email": "john@example.com", "name": "John Smith", - "blocked": false, + "state": "active", "created_at": "2012-05-23T08:00:58Z", "bio": null, "skype": "", "linkedin": "", "twitter": "", - "dark_scheme": false, "extern_uid": "john.smith", "provider": "provider_name", "theme_id": 1 + "color_scheme_id": 2 } ``` @@ -156,14 +156,14 @@ GET /user "email": "john@example.com", "name": "John Smith", "private_token": "dd34asd13as", - "blocked": false, + "state": "active", "created_at": "2012-05-23T08:00:58Z", "bio": null, "skype": "", "linkedin": "", "twitter": "", - "dark_scheme": false, "theme_id": 1 + "color_scheme_id": 2 "is_admin": false, "can_create_group" : true, "can_create_team" : true, diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7b35f5f529f..025f44fb319 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -2,7 +2,7 @@ module API module Entities class User < Grape::Entity expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter, - :dark_scheme, :theme_id, :state, :created_at, :extern_uid, :provider + :theme_id, :color_scheme_id, :state, :created_at, :extern_uid, :provider end class UserSafe < Grape::Entity |