diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-08-30 14:27:40 +0300 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-05 13:18:33 +0300 |
| commit | 978252a3fa99414446ce887cd28bf2db5b223d44 (patch) | |
| tree | b7e306e89b04ee3d30e35987fe5ecfcdc6b32902 /lib/gitlab/gpg | |
| parent | 31ad752e0688677c0113d4b324c759413858297b (diff) | |
use new #verification_status
Diffstat (limited to 'lib/gitlab/gpg')
| -rw-r--r-- | lib/gitlab/gpg/commit.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/gpg/invalid_gpg_signature_updater.rb | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/gpg/commit.rb b/lib/gitlab/gpg/commit.rb index a206249ef5a..86bd9f5b125 100644 --- a/lib/gitlab/gpg/commit.rb +++ b/lib/gitlab/gpg/commit.rb @@ -77,7 +77,6 @@ module Gitlab gpg_key_primary_keyid: gpg_key&.primary_keyid || verified_signature.fingerprint, gpg_key_user_name: user_infos[:name], gpg_key_user_email: user_infos[:email], - valid_signature: verification_status == :verified, verification_status: verification_status } end diff --git a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb index a525ee7a9ee..7bdf6760295 100644 --- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb +++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb @@ -6,9 +6,15 @@ module Gitlab end def run + # `OR valid_signature` is for backwards compatibility: legacy records + # that weren't migrated to use the new `#verification_status` have + # `#valid_signature` set instead GpgSignature .select(:id, :commit_sha, :project_id) - .where('gpg_key_id IS NULL OR valid_signature = ?', false) + .where('gpg_key_id IS NULL OR valid_signature = ? OR verification_status <> ?', + false, + GpgSignature.verification_statuses[:verified] + ) .where(gpg_key_primary_keyid: @gpg_key.primary_keyid) .find_each { |sig| sig.gpg_commit.update_signature!(sig) } end |