diff options
author | Andrew8xx8 <avk@8xx8.ru> | 2013-03-04 18:52:30 +0400 |
---|---|---|
committer | Andrew8xx8 <avk@8xx8.ru> | 2013-03-04 18:52:30 +0400 |
commit | 0d9a6fe7b16e52cc4d5595d6b26552c39911cf07 (patch) | |
tree | 96e0725dfb072df84198f1c2e2407ceda41caa3b /lib/api/entities.rb | |
parent | 9a06dd4aa1ab008b6e12205ec3f8d00a50f79aa1 (diff) | |
download | gitlab-ce-0d9a6fe7b16e52cc4d5595d6b26552c39911cf07.tar.gz |
User's blocked field refactored to use state machine
Diffstat (limited to 'lib/api/entities.rb')
-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 |