summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-06-24 21:24:49 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 15:43:36 +0200
commit7fc69a7ed4acb6a583c473799b4169825dcd3777 (patch)
tree7cf9b5da54f37dd694f158778ad2156edacd444a /app/helpers
parentee7468e786e434273211586df1408a3c6268e9ed (diff)
downloadgitlab-ce-7fc69a7ed4acb6a583c473799b4169825dcd3777.tar.gz
linkify the whole user badge part, not only avatar
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/commits_helper.rb36
1 files changed, 19 insertions, 17 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 34ba5694288..e31baa52e99 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -228,23 +228,25 @@ module CommitsHelper
end
content = capture do
- concat(
- content_tag(:div, class: 'gpg-badge-popover-avatar') do
- user_avatar(user: signature.gpg_key.user, size: 32)
- end
- )
-
- concat(
- content_tag(:div, class: 'gpg-badge-popover-username') do
- signature.gpg_key.user.username
- end
- )
-
- concat(
- content_tag(:div) do
- signature.gpg_key.user.name
- end
- )
+ link_to user_path(signature.gpg_key.user), class: 'gpg-badge-popover-user-link' do
+ concat(
+ content_tag(:div, class: 'gpg-badge-popover-avatar') do
+ user_avatar_without_link(user: signature.gpg_key.user, size: 32)
+ end
+ )
+
+ concat(
+ content_tag(:div, class: 'gpg-badge-popover-username') do
+ signature.gpg_key.user.username
+ end
+ )
+
+ concat(
+ content_tag(:div) do
+ signature.gpg_key.user.name
+ end
+ )
+ end
end
commit_gpg_signature_badge_with(signature, label: 'Verified', title: title, content: content, css_classes: ['valid'])