diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-12 12:19:45 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 15:20:55 +0200 |
| commit | 91ac0e038ab51dd2f30f2bb7c91837fa588ca250 (patch) | |
| tree | 54b5ea7cb6115a09bbcead558252563664b4898c /lib/api/entities.rb | |
| parent | 3cb84e06b7a118fb46b4e1e0d4885026c9d4a4d1 (diff) | |
| download | gitlab-ce-91ac0e038ab51dd2f30f2bb7c91837fa588ca250.tar.gz | |
Port 'Add user activities API' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 9919762cd82..939cedc1b27 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -18,6 +18,11 @@ module API expose :bio, :location, :skype, :linkedin, :twitter, :website_url, :organization end + class UserActivity < Grape::Entity + expose :username + expose :last_activity_at + end + class Identity < Grape::Entity expose :provider, :extern_uid end |