summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-14 08:37:55 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-14 08:37:55 +0300
commit1cbfc8d0af7dabb88da8628d5706f7e721ce90ce (patch)
tree14c4ca49e1dc9247af0b1083184e69417cf1c051 /app
parent74c8a635ce27336cd385d438291b22e921f88e1c (diff)
downloadgitlab-ce-1cbfc8d0af7dabb88da8628d5706f7e721ce90ce.tar.gz
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/users/show.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 1b5340d687d..6cf7152e5f7 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -46,7 +46,10 @@
%li
%span.light Last sign-in at:
%strong
- = @admin_user.last_sign_in_at.stamp("Nov 12, 2031")
+ - if @admin_user.last_sign_in_at
+ = @admin_user.last_sign_in_at.stamp("Nov 12, 2031")
+ - else
+ never
- if @admin_user.ldap_user?
%li