summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@buckle.com>2013-05-28 18:41:15 -0500
committerDrew Blessing <drew.blessing@buckle.com>2013-05-29 05:40:17 -0500
commit07fd95f3840908018cb3712162a441e63409bc31 (patch)
tree47dd5019aafe04b2d44150f23e87d55c0ba96347 /lib
parentd58aca0693d28e17633fb0d2825f1cddfd4f0748 (diff)
downloadgitlab-ce-07fd95f3840908018cb3712162a441e63409bc31.tar.gz
Update api docs and remove old attribute from User entity.
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity. Add color scheme ID to API User entity
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index c3c351e1733..a8f5068d041 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