summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-09-20 08:36:43 -0700
committerNihad Abbasov <narkoz.2008@gmail.com>2012-09-20 08:36:43 -0700
commit3dd940d4cbd72afed38eba49b557823a6a55eac2 (patch)
treec078f1bba34b19340dced6efcbfc652e464bdb6f /lib/api
parent9aafe77e708174aac697a8dcafc99b90e96be36e (diff)
downloadgitlab-ce-3dd940d4cbd72afed38eba49b557823a6a55eac2.tar.gz
API: extend UserLogin entity from UserBasic
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 5d8cc2765b1..a8b786aebb0 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -9,8 +9,8 @@ module Gitlab
expose :id, :email, :name, :blocked, :created_at
end
- class UserLogin < Grape::Entity
- expose :id, :email, :name, :private_token, :blocked, :created_at
+ class UserLogin < UserBasic
+ expose :private_token
end
class Hook < Grape::Entity
@@ -56,9 +56,7 @@ module Gitlab
end
class Key < Grape::Entity
- expose :id,
- :title,
- :key
+ expose :id, :title, :key
end
end
end