diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-11-27 13:34:39 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-12-04 13:03:55 +0200 |
| commit | 3a5ed5260b24051939575d1934ce9b8392cac09f (patch) | |
| tree | 04d361e52d16234f00e5cdd27b5ebfef9a503579 /lib/api/entities.rb | |
| parent | 1a80d13a3990937580c97e2b0ba8fb98f69bc055 (diff) | |
| download | gitlab-ce-3a5ed5260b24051939575d1934ce9b8392cac09f.tar.gz | |
Supporting for multiple omniauth provider for the same user
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 42e4442365d..2fea151aeb3 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -14,10 +14,14 @@ module API expose :bio, :skype, :linkedin, :twitter, :website_url end + class Identity < Grape::Entity + expose :provider, :extern_uid + end + class UserFull < User expose :email - expose :theme_id, :color_scheme_id, :extern_uid, :provider, \ - :projects_limit + expose :theme_id, :color_scheme_id, :projects_limit + expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project end |