OSDN Git Service
(root)
/
wvm
/
gitlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9aafe77
)
API: extend UserLogin entity from UserBasic
author
Nihad Abbasov
<narkoz.2008@gmail.com>
Thu, 20 Sep 2012 15:36:43 +0000
(08:36 -0700)
committer
Nihad Abbasov
<narkoz.2008@gmail.com>
Thu, 20 Sep 2012 15:36:43 +0000
(08:36 -0700)
lib/api/entities.rb
patch
|
blob
|
history
diff --git
a/lib/api/entities.rb
b/lib/api/entities.rb
index
5d8cc27
..
a8b786a
100644
(file)
--- 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