diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-09 10:30:49 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-09 10:30:49 +0000 |
| commit | cb4964d23b49f775ad3c8aa562942911b6b1c262 (patch) | |
| tree | cb8af8e74102d709c40e1119b000e0f8ae1419b9 /app/views/profiles/keys | |
| parent | fb5ded7d8ef32177e51af047e4dafbc3ed9c6abb (diff) | |
| parent | b6df93a51f90c7ed29ce6667c6b1a8debf02506e (diff) | |
| download | gitlab-ce-cb4964d23b49f775ad3c8aa562942911b6b1c262.tar.gz | |
Merge branch 'track_last_used_date_of_ssh_keys' into 'master'
Record and show last used date of SSH Keys
See merge request !8113
Diffstat (limited to 'app/views/profiles/keys')
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 3 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index 3276db6692c..d2a60ac2867 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -6,6 +6,9 @@ = key.title .description = key.fingerprint + .last-used-at + last used: + = key.last_used_at ? time_ago_with_tooltip(key.last_used_at) : 'n/a' .pull-right %span.key-created-at created #{time_ago_with_tooltip(key.created_at)} diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index dd7615400dc..d44603c638c 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -11,6 +11,9 @@ %li %span.light Created on: %strong= @key.created_at.to_s(:medium) + %li + %span.light Last used on: + %strong= @key.last_used_at.try(:to_s, :medium) || 'N/A' .col-md-8 %p |