summaryrefslogtreecommitdiff
path: root/app/models/key.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-20 13:49:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-20 13:49:51 +0000
commit71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e (patch)
tree6a2d93ef3fb2d353bb7739e4b57e6541f51cdd71 /app/models/key.rb
parenta7253423e3403b8c08f8a161e5937e1488f5f407 (diff)
downloadgitlab-ce-71786ddc8e28fbd3cb3fcc4b3ff15e5962a1c82e.tar.gz
Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42
Diffstat (limited to 'app/models/key.rb')
-rw-r--r--app/models/key.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 1f2234129ed..596186276bb 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -11,6 +11,8 @@ class Key < ApplicationRecord
belongs_to :user
+ has_many :ssh_signatures, class_name: 'CommitSignatures::SshSignature'
+
before_validation :generate_fingerprint
validates :title,
@@ -136,6 +138,10 @@ class Key < ApplicationRecord
save if generate_fingerprint
end
+ def signing?
+ super || auth_and_signing?
+ end
+
private
def generate_fingerprint