summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-04 18:07:03 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-04 18:07:03 +0300
commitc874422bb06b82d74adf318a9093ae65d12eaa59 (patch)
treefa7de95fc9068838d0b650b42f32bccfe47b06d9 /lib
parent2587334a79fbc08bf8551085eb57b8b36eb64afe (diff)
parentf4d05dcc90dd423db3c9e7798ad3cd9e48cd886b (diff)
downloadgitlab-ce-c874422bb06b82d74adf318a9093ae65d12eaa59.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
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