diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-12 11:44:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-12 11:44:40 +0000 |
| commit | e85faec90e555a79588e185d81403ab371b4924f (patch) | |
| tree | dc1d5775ea3b81a9e86a0ef4ed45c6fe08a3ee94 | |
| parent | c3049883061d4083340b9ace580b283d00e48982 (diff) | |
| parent | 75123458eecbc34d01844538b9ffc04c71f550d6 (diff) | |
| download | gitlab-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:
See merge request !2381
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 175399fe1fa..d672d408318 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.4.0 (unreleased) - Improved performance of finding issues for an entire group (Yorick Peterse) - Added custom application performance measuring system powered by InfluxDB (Yorick Peterse) - Bump fog to 1.36.0 (Stan Hu) + - Add user's last used IP addresses to admin page (Stan Hu) - Add housekeeping function to project settings page - The default GitLab logo now acts as a loading indicator - Fix caching issue where build status was not updating in project dashboard (Stan Hu) 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 |