Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/app/models/commit_signatures/gpg_signature.rb b/app/models/commit_signatures/gpg_signature.rb
index 2ae59853520..a9e8ca2dd33 100644
--- a/app/models/commit_signatures/gpg_signature.rb
+++ b/app/models/commit_signatures/gpg_signature.rb
@@ -2,6 +2,7 @@
 module CommitSignatures
   class GpgSignature < ApplicationRecord
     include CommitSignature
+    include SignatureType
 
     sha_attribute :gpg_key_primary_keyid
 
@@ -10,6 +11,14 @@ module CommitSignatures
 
     validates :gpg_key_primary_keyid, presence: true
 
+    def signed_by_user
+      gpg_key&.user
+    end
+
+    def type
+      :gpg
+    end
+
     def self.with_key_and_subkeys(gpg_key)
       subkey_ids = gpg_key.subkeys.pluck(:id)