Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-09-28 04:45:08 +0300
committerRubén Dávila <ruben@gitlab.com>2017-10-05 16:25:27 +0300
commitc73748e3c4409de7ab945f502d55fe4d62ebd5eb (patch)
tree5b6d985f0ae70a7f02a762cde8ac2a28d5f4e8b0 /app/views/profiles/gpg_keys
parent9b4990a4d71b057f0fec14399cd1f2a421901963 (diff)
Render GPG subkeys on index page
Diffstat (limited to 'app/views/profiles/gpg_keys')
-rw-r--r--app/views/profiles/gpg_keys/_key.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/profiles/gpg_keys/_key.html.haml b/app/views/profiles/gpg_keys/_key.html.haml
index 970e92aadaa..5ed517c1ef6 100644
--- a/app/views/profiles/gpg_keys/_key.html.haml
+++ b/app/views/profiles/gpg_keys/_key.html.haml
@@ -7,6 +7,13 @@
.description
%code= key.fingerprint
+ - if key.subkeys.present?
+ .subkeys
+ %span.bold Subkeys:
+ %ul.subkeys-list
+ - key.subkeys.each do |subkey|
+ %li
+ %code= subkey.fingerprint
.pull-right
%span.key-created-at
created #{time_ago_with_tooltip(key.created_at)}