diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/models/commit_signatures/ssh_signature.rb | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/models/commit_signatures/ssh_signature.rb')
-rw-r--r-- | app/models/commit_signatures/ssh_signature.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/commit_signatures/ssh_signature.rb b/app/models/commit_signatures/ssh_signature.rb index 1e64e2b2978..e9e16651d1c 100644 --- a/app/models/commit_signatures/ssh_signature.rb +++ b/app/models/commit_signatures/ssh_signature.rb @@ -6,13 +6,18 @@ module CommitSignatures include SignatureType belongs_to :key, optional: true + belongs_to :user, optional: true def type :ssh end def signed_by_user - key&.user + user || key&.user + end + + def key_fingerprint_sha256 + super || key&.fingerprint_sha256 end end end |