summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-29 23:25:40 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-29 23:25:40 -0700
commitcd5685ca8ce14ff4dbff6ada5e5a8b90808ae3d1 (patch)
treec77c33dfcac46fdc42391c63842267858492bbba /lib/api
parent56ddf93f8eae54e545260d40abe5f8bef1979fe1 (diff)
parent07fd95f3840908018cb3712162a441e63409bc31 (diff)
downloadgitlab-ce-cd5685ca8ce14ff4dbff6ada5e5a8b90808ae3d1.tar.gz
Merge pull request #4115 from bke-drewb/apidocs
Update api docs and remove old attribute from User entity.
Diffstat (limited to 'lib/api')
-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 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