diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-12 07:59:28 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:43:37 +0200 |
| commit | 027309eb2ae54614a2ee1a0ca9e4cea76a86b94b (patch) | |
| tree | d5479187f2a89e2a24e5a62044861effd05b841c /app/views | |
| parent | 111edaa9f75f402cc18c2bec5cab9aa6615d9c4d (diff) | |
| download | gitlab-ce-027309eb2ae54614a2ee1a0ca9e4cea76a86b94b.tar.gz | |
user may now revoke a gpg key
other than just removing a key, which doesn't affect the verified state
of a commit, revoking a key unverifies all signed commits.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/gpg_keys/_key.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/profiles/gpg_keys/_key.html.haml b/app/views/profiles/gpg_keys/_key.html.haml index b4b9aa07190..86e2510d22f 100644 --- a/app/views/profiles/gpg_keys/_key.html.haml +++ b/app/views/profiles/gpg_keys/_key.html.haml @@ -3,13 +3,17 @@ = icon 'key', class: "settings-list-icon hidden-xs" .key-list-item-info - key.emails_with_verified_status.map do |email, verified| + = email = verified_email_badge(email, verified) .description - = key.fingerprint + %code= key.fingerprint .pull-right %span.key-created-at created #{time_ago_with_tooltip(key.created_at)} - = link_to profile_gpg_key_path(key), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-transparent prepend-left-10" do + = link_to profile_gpg_key_path(key), data: { confirm: 'Are you sure? Removing this GPG key does not affect already signed commits.' }, method: :delete, class: "btn btn-danger prepend-left-10" do %span.sr-only Remove = icon('trash') + = link_to revoke_profile_gpg_key_path(key), data: { confirm: 'Are you sure? All commits that were signed with this GPG key will be unverified.' }, method: :put, class: "btn btn-danger prepend-left-10" do + %span.sr-only Revoke + Revoke |