Add latest changes from gitlab-org/gitlab@master

2 files changed, 32 insertions, 8 deletions

diff --git a/lib/gitlab/ssh/commit.rb b/lib/gitlab/ssh/commit.rb
new file mode 100644
index 00000000000..bfeefc47f13
--- /dev/null
+++ b/lib/gitlab/ssh/commit.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ssh
+    class Commit < Gitlab::SignedCommit
+      private
+
+      def signature_class
+        CommitSignatures::SshSignature
+      end
+
+      def attributes
+        signature = ::Gitlab::Ssh::Signature.new(signature_text, signed_text, @commit.committer_email)
+
+        {
+          commit_sha: @commit.sha,
+          project: @commit.project,
+          key_id: signature.signed_by_key&.id,
+          verification_status: signature.verification_status
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ssh/signature.rb b/lib/gitlab/ssh/signature.rb
index 1a236e1a70c..3b4df9a8d0c 100644
--- a/lib/gitlab/ssh/signature.rb
+++ b/lib/gitlab/ssh/signature.rb
@@ -26,6 +26,14 @@ module Gitlab
         end
       end
 
+      def signed_by_key
+        strong_memoize(:signed_by_key) do
+          next unless key_fingerprint
+
+          Key.find_by_fingerprint_sha256(key_fingerprint)
+        end
+      end
+
       private
 
       def all_attributes_present?
@@ -61,14 +69,6 @@ module Gitlab
       def key_fingerprint
         strong_memoize(:key_fingerprint) { signature&.public_key&.fingerprint }
       end
-
-      def signed_by_key
-        strong_memoize(:signed_by_key) do
-          next unless key_fingerprint
-
-          Key.find_by_fingerprint_sha256(key_fingerprint)
-        end
-      end
     end
   end
 end