diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-31 13:00:50 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-31 13:00:50 +0200 |
| commit | fd1b9fdc12f0fac112810851903203bc256b6548 (patch) | |
| tree | ead4e97e0b6a6cc22f080e33135756d9b0702d9e /lib/api/entities.rb | |
| parent | afdb09de80191d9424c34b7bab3e2f8d5fd1c782 (diff) | |
| parent | e954438a1d3a45addebf52ab04155459d7d84db0 (diff) | |
| download | gitlab-ce-fd1b9fdc12f0fac112810851903203bc256b6548.tar.gz | |
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
Conflicts:
spec/requests/api/users_spec.rb
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 3637464676b..da51bc6ecd6 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 |