summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-12 11:44:40 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-12 11:44:40 +0000
commite85faec90e555a79588e185d81403ab371b4924f (patch)
treedc1d5775ea3b81a9e86a0ef4ed45c6fe08a3ee94 /app
parentc3049883061d4083340b9ace580b283d00e48982 (diff)
parent75123458eecbc34d01844538b9ffc04c71f550d6 (diff)
downloadgitlab-ce-e85faec90e555a79588e185d81403ab371b4924f.tar.gz
Merge branch 'show-ip-addresses' into 'master'
Add user's last used IP addresses to admin page This would help admins figure out from where spam is originating. Screenshot: ![image](/uploads/984005a3a35b7004bd0a363081eb53ba/image.png) See merge request !2381
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/users/show.html.haml16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 2c2450d4117..2bdbae19588 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -71,6 +71,14 @@
No
%li
+ %span.light Current sign-in IP:
+ %strong
+ - if @user.current_sign_in_ip
+ = @user.current_sign_in_ip
+ - else
+ never
+
+ %li
%span.light Current sign-in at:
%strong
- if @user.current_sign_in_at
@@ -79,6 +87,14 @@
never
%li
+ %span.light Last sign-in IP:
+ %strong
+ - if @user.last_sign_in_ip
+ = @user.last_sign_in_ip
+ - else
+ never
+
+ %li
%span.light Last sign-in at:
%strong
- if @user.last_sign_in_at