summaryrefslogtreecommitdiff
path: root/app/views/users/show.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-30 09:09:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-30 09:09:12 +0000
commit4ac9f1b8eaef29daa484b27a3113505cfa6a6dcb (patch)
treebda090fb8cf7c97765ee891bd58f7f9ee4271301 /app/views/users/show.html.haml
parentabbedc2027e64b11b03be4639411f1943b81f7ce (diff)
downloadgitlab-ce-4ac9f1b8eaef29daa484b27a3113505cfa6a6dcb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users/show.html.haml')
-rw-r--r--app/views/users/show.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 8818cd9e6c4..ec0b59785ca 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -26,6 +26,13 @@
= link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referer), class: link_classes + 'btn gl-button btn-default btn-icon',
title: s_('UserProfile|Report abuse'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= sprite_icon('error')
+ - verified_gpg_keys = @user.gpg_keys.select(&:verified?)
+ - if verified_gpg_keys.any?
+ = link_to user_gpg_keys_path,
+ class: link_classes + 'btn btn-default btn-md gl-button btn-icon has-tooltip',
+ title: n_('View public GPG key', 'View public GPG keys', verified_gpg_keys.length),
+ data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
+ = sprite_icon('key', css_class: 'gl-button-icon gl-icon')
- if can?(current_user, :read_user_profile, @user)
= link_to user_path(@user, rss_url_options), class: link_classes + 'btn gl-button btn-default btn-icon has-tooltip',
title: s_('UserProfile|Subscribe'), data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do