diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 05:38:16 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-05 05:38:16 -0800 |
| commit | f22488f7262145c1e318db15c0af2091e67d5007 (patch) | |
| tree | c58e6e34b5f0c53467c9ca24e4c8fe3ed29f61fc /lib/api | |
| parent | f9200e118c3afb6384bc858792133060cf6655fe (diff) | |
| parent | c6d6bd6ab48c999c46e3944bd037f6b34f55fa93 (diff) | |
| download | gitlab-ce-f22488f7262145c1e318db15c0af2091e67d5007.tar.gz | |
Merge pull request #3143 from Undev/state-machine-3
State machine 3
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 1cae1d337fe..088c9959804 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -2,11 +2,11 @@ module Gitlab module Entities class User < Grape::Entity expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter, - :dark_scheme, :theme_id, :blocked, :created_at, :extern_uid, :provider + :dark_scheme, :theme_id, :state, :created_at, :extern_uid, :provider end class UserBasic < Grape::Entity - expose :id, :username, :email, :name, :blocked, :created_at + expose :id, :username, :email, :name, :state, :created_at end class UserLogin < UserBasic |