Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/gitlab/ssh/commit.rb b/lib/gitlab/ssh/commit.rb
index bfeefc47f13..d9ac8c1b881 100644
--- a/lib/gitlab/ssh/commit.rb
+++ b/lib/gitlab/ssh/commit.rb
@@ -16,6 +16,8 @@ module Gitlab
           commit_sha: @commit.sha,
           project: @commit.project,
           key_id: signature.signed_by_key&.id,
+          key_fingerprint_sha256: signature.key_fingerprint,
+          user_id: signature.signed_by_key&.user_id,
           verification_status: signature.verification_status
         }
       end
diff --git a/lib/gitlab/ssh/signature.rb b/lib/gitlab/ssh/signature.rb
index a654d5b2ff1..763d89116f1 100644
--- a/lib/gitlab/ssh/signature.rb
+++ b/lib/gitlab/ssh/signature.rb
@@ -41,6 +41,10 @@ module Gitlab
         end
       end
 
+      def key_fingerprint
+        strong_memoize(:key_fingerprint) { signature&.public_key&.fingerprint }
+      end
+
       private
 
       def all_attributes_present?
@@ -77,10 +81,6 @@ module Gitlab
           nil
         end
       end
-
-      def key_fingerprint
-        strong_memoize(:key_fingerprint) { signature&.public_key&.fingerprint }
-      end
     end
   end
 end