summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorBoyan Tabakov <boyan.tabakov@futurice.com>2012-12-18 21:24:31 +0200
committerBoyan Tabakov <boyan.tabakov@futurice.com>2012-12-18 21:24:31 +0200
commite954438a1d3a45addebf52ab04155459d7d84db0 (patch)
treef88bc4f1aaf560f34fb0f7b106a8e5f3a215ee17 /lib/api/entities.rb
parentf4a6f1fd5a9fb9f35bb43956275c5f1da96ce019 (diff)
downloadgitlab-ce-e954438a1d3a45addebf52ab04155459d7d84db0.tar.gz
Extended users API to support updating and deleting users.
Also added tests.
Diffstat (limited to 'lib/api/entities.rb')
-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 070fbad27ed..bfb9093d61e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -2,7 +2,7 @@ module Gitlab
module Entities
class User < Grape::Entity
expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter,
- :dark_scheme, :theme_id, :blocked, :created_at
+ :dark_scheme, :theme_id, :blocked, :created_at, :extern_uid, :provider
end
class UserBasic < Grape::Entity