deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

User's blocked field refactored to use state machine

Browse source
This commit is contained in:
Andrew8xx8 2013-03-04 18:52:30 +04:00
parent 9a06dd4aa1
commit 0d9a6fe7b1
12 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/api/entities.rb
View file

@ -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