diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
| commit | 3cd08f4bf96cda3e9d3abf233095107832b17c20 (patch) | |
| tree | dc09a618783a79d70f2a404374d4b850ccf9cc84 /lib/gitlab/x509 | |
| parent | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/x509')
| -rw-r--r-- | lib/gitlab/x509/commit.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/x509/commit.rb b/lib/gitlab/x509/commit.rb index b1d15047981..4b35c0ef7d2 100644 --- a/lib/gitlab/x509/commit.rb +++ b/lib/gitlab/x509/commit.rb @@ -184,11 +184,13 @@ module Gitlab commit_sha: @commit.sha, project: @commit.project, x509_certificate_id: certificate.id, - verification_status: verification_status + verification_status: verification_status(certificate) } end - def verification_status + def verification_status(certificate) + return :unverified if certificate.revoked? + if verified_signature && certificate_email == @commit.committer_email :verified else |