diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-04 11:03:25 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-04 11:03:25 +0300 |
| commit | f4d05dcc90dd423db3c9e7798ad3cd9e48cd886b (patch) | |
| tree | fa70d3d83d2001af184e3f033d7449a97f65361e | |
| parent | e9e79fdfdf7eee14efa9c5e8038b46538b6ac5e3 (diff) | |
| parent | 361284fec23eebc09c4bba418306a36805504dc7 (diff) | |
| download | gitlab-ce-f4d05dcc90dd423db3c9e7798ad3cd9e48cd886b.tar.gz | |
Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-api
Add current_sign_in_at to api User
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/api/users.md | 6 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index b9bd102ddf6..73567e11802 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,7 @@ v 7.11.0 (unreleased) - Add room notification and message color option for HipChat - Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka) - Add footnotes support to Markdown (Guillaume Delbergue) + - Add current_sign_in_at to UserFull REST api. v 7.10.0 - Ignore submodules that are defined in .gitmodules but are checked in as directories. diff --git a/doc/api/users.md b/doc/api/users.md index a8b7685b503..cd141daadc8 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -57,7 +57,8 @@ GET /users "color_scheme_id": 2, "is_admin": false, "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", - "can_create_group": true + "can_create_group": true, + "current_sign_in_at": "2014-03-19T13:12:15Z" }, { "id": 2, @@ -79,7 +80,8 @@ GET /users "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", "can_create_group": true, "can_create_project": true, - "projects_limit": 100 + "projects_limit": 100, + "current_sign_in_at": "2014-03-19T17:54:13Z" } ] ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 79b4afa40ba..b23eff3661c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -20,7 +20,7 @@ module API class UserFull < User expose :email - expose :theme_id, :color_scheme_id, :projects_limit + expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project |