Commit c874422b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 2587334a f4d05dcc
No related merge requests found
......@@ -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.
......
......@@ -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"
}
]
```
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment