diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-28 04:45:08 +0300 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-10-05 16:25:27 +0300 |
| commit | c73748e3c4409de7ab945f502d55fe4d62ebd5eb (patch) | |
| tree | 5b6d985f0ae70a7f02a762cde8ac2a28d5f4e8b0 /app | |
| parent | 9b4990a4d71b057f0fec14399cd1f2a421901963 (diff) | |
Render GPG subkeys on index page
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 9 | ||||
| -rw-r--r-- | app/controllers/profiles/gpg_keys_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/gpg_key.rb | 2 | ||||
| -rw-r--r-- | app/views/profiles/gpg_keys/_key.html.haml | 7 |
4 files changed, 19 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 6c521bb06ee..eab39f698c3 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -108,6 +108,15 @@ } } +.subkeys-list { + @include basic-list; + + li { + padding: 3px 0; + border: none; + } +} + .key-list-item { .key-list-item-info { @media (min-width: $screen-sm-min) { diff --git a/app/controllers/profiles/gpg_keys_controller.rb b/app/controllers/profiles/gpg_keys_controller.rb index 689c76059f6..38e3eacd229 100644 --- a/app/controllers/profiles/gpg_keys_controller.rb +++ b/app/controllers/profiles/gpg_keys_controller.rb @@ -2,7 +2,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController before_action :set_gpg_key, only: [:destroy, :revoke] def index - @gpg_keys = current_user.gpg_keys + @gpg_keys = current_user.gpg_keys.with_subkeys @gpg_key = GpgKey.new end diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index ed09b44027c..e6c862d9b55 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -12,6 +12,8 @@ class GpgKey < ActiveRecord::Base has_many :gpg_signatures has_many :subkeys, class_name: 'GpgKeySubkey' + scope :with_subkeys, -> { includes(:subkeys) } + validates :user, presence: true validates :key, 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)} |