diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:30:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-08 17:30:10 +0000 |
| commit | fe9a445faaaa5a90c9308b01877aadc1984a111b (patch) | |
| tree | 37314e0d8567219944c59a8d910b492cb7f840ea /lib | |
| parent | 24663e80953ce48db600c17aa7baa91d8e38680c (diff) | |
| parent | b0d24ab1b52a78bf855a70886113b79707036029 (diff) | |
| download | gitlab-ce-fe9a445faaaa5a90c9308b01877aadc1984a111b.tar.gz | |
Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
Expose User#last_sign_in_at and User#confirmed_at for admins
Closes #840
See merge request !3090
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b021db8fa5b..0779fb881a0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -23,6 +23,8 @@ module API end class UserFull < User + expose :last_sign_in_at + expose :confirmed_at expose :email expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity |