summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCyril <jv.cyril@gmail.com>2012-12-10 23:46:31 +0100
committerCyril <jv.cyril@gmail.com>2012-12-12 18:51:20 +0100
commitd3b8952f8fb067afe89f08eadbae7733c0cc6824 (patch)
treeef0663a6e52d527045727c875d4c15fa0020778e /lib
parentb48852e78901e3ce3fdc6449c4dc67d01b30f0ca (diff)
downloadgitlab-ce-d3b8952f8fb067afe89f08eadbae7733c0cc6824.tar.gz
Add username to User and UserBasic entities in API and in examples in doc.
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9e9d44594a2..070fbad27ed 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1,12 +1,12 @@
module Gitlab
module Entities
class User < Grape::Entity
- expose :id, :email, :name, :bio, :skype, :linkedin, :twitter,
+ expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter,
:dark_scheme, :theme_id, :blocked, :created_at
end
class UserBasic < Grape::Entity
- expose :id, :email, :name, :blocked, :created_at
+ expose :id, :username, :email, :name, :blocked, :created_at
end
class UserLogin < UserBasic