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

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.

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"
   }
 ]
 ```

lib/api/entities.rb

@@ -20,7 +20,7 @@ class Identity < Grape::Entity
 
     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