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/x509_commit_signature.rb b/app/models/commit_signatures/x509_commit_signature.rb
index 2cbb331dd7e..4edbc147502 100644
--- a/app/models/commit_signatures/x509_commit_signature.rb
+++ b/app/models/commit_signatures/x509_commit_signature.rb
@@ -2,15 +2,24 @@
 module CommitSignatures
   class X509CommitSignature < ApplicationRecord
     include CommitSignature
+    include SignatureType
 
     belongs_to :x509_certificate, class_name: 'X509Certificate', foreign_key: 'x509_certificate_id', optional: false
 
     validates :x509_certificate_id, presence: true
 
+    def type
+      :x509
+    end
+
     def x509_commit
       return unless commit
 
       Gitlab::X509::Commit.new(commit)
     end
+
+    def signed_by_user
+      commit&.committer
+    end
   end
 end