diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2017-09-28 00:11:42 +0300 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2017-10-05 16:25:27 +0300 |
| commit | a41e7e0105e238161ba697ebf26d8554ae59d295 (patch) | |
| tree | 2569ea57cecdfeadb8584b721a255ae4d5f6dbc4 /lib/gitlab/gpg | |
| parent | d0572d9aad2c434a040f11956a4c3feac1afdcf8 (diff) | |
Add ability to include subkeys when finding by fingerprint
Diffstat (limited to 'lib/gitlab/gpg')
| -rw-r--r-- | lib/gitlab/gpg/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index 86bd9f5b125..40274e13918 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -43,7 +43,7 @@ module Gitlab # key belonging to the keyid. # This way we can add the key to the temporary keychain and extract # the proper signature. - gpg_key = GpgKey.find_by(primary_keyid: verified_signature.fingerprint) + gpg_key = GpgKey.find_with_subkeys(verified_signature.fingerprint) if gpg_key Gitlab::Gpg::CurrentKeyChain.add(gpg_key.key) |