Merge branch 'feat/tagger' into 'master'

Add tagger within tag view

See merge request gitlab-org/gitlab!19681

app/helpers/git_helper.rb

 # frozen_string_literal: true
 
 module GitHelper
-  def strip_gpg_signature(text)
+  def strip_signature(text)
     text.gsub(/-----BEGIN PGP SIGNATURE-----(.*)-----END PGP SIGNATURE-----/m, "")
+    text.gsub(/-----BEGIN PGP MESSAGE-----(.*)-----END PGP MESSAGE-----/m, "")
+    text.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "")
   end
 
   def short_sha(text)

app/views/projects/tags/_tag.atom.builder

@@ -7,7 +7,7 @@ if commit
     xml.id      tag_url
     xml.link    href: tag_url
     xml.title   truncate(tag.name, length: 80)
-    xml.summary strip_gpg_signature(tag.message)
+    xml.summary strip_signature(tag.message)
     xml.content markdown_field(release, :description), type: 'html'
     xml.updated release.updated_at.xmlschema if release
     xml.media   :thumbnail, width: '40', height: '40', url: image_url(avatar_icon_for_email(commit.author_email))

app/views/projects/tags/_tag.html.haml

@@ -11,7 +11,7 @@
 
     - if tag.message.present?
        
-      = strip_gpg_signature(tag.message)
+      = strip_signature(tag.message)
 
     - if commit
       .block-truncated

app/views/projects/tags/show.html.haml

+- user = user_email = nil
+- if @tag.tagger
+  - user_email = @tag.tagger.email
+  - user = User.find_by_any_email(user_email)
 - add_to_breadcrumbs s_('TagsPage|Tags'), project_tags_path(@project)
 - breadcrumb_title @tag.name
 - page_title @tag.name, s_('TagsPage|Tags')
@@ -11,6 +15,24 @@
       - if protected_tag?(@project, @tag)
         %span.badge.badge-success
           = s_('TagsPage|protected')
+
+    - if user
+      = link_to user_path(user) do
+        %div
+          = user_avatar_without_link(user: user, size: 32, css_class: "mt-1 mb-1")
+
+        %div
+          %strong= user.name
+          %div= user.to_reference
+
+    - elsif user_email
+      = mail_to user_email do
+        %div
+          = user_avatar_without_link(user_email: user_email, size: 32, css_class: "mt-1 mb-1")
+
+        %div{ :class => "clearfix" }
+          %strong= user_email
+
     - if @commit
       = render 'projects/branches/commit', commit: @commit, project: @project
     - else
@@ -33,7 +55,7 @@
 
   - if @tag.message.present?
     %pre.wrap
-      = strip_gpg_signature(@tag.message)
+      = strip_signature(@tag.message)
 
 .append-bottom-default.prepend-top-default
   - if @release.description.present?

changelogs/unreleased/feat-tagger.yml

+---
+title: add tagger within tag view
+merge_request: 19681
+author: Roger Meier
+type: added

lib/gitlab/git/tag.rb

@@ -62,6 +62,10 @@ module Gitlab
         encode! @message
       end
 
+      def tagger
+        @raw_tag.tagger
+      end
+
       private
 
       def message_from_gitaly_tag