From b62c1620ea8d4260bb60303d4825a214c7ed56ee Mon Sep 17 00:00:00 2001 From: Alexis Reigel Date: Thu, 31 Aug 2017 20:43:24 +0200 Subject: drop backwards compatibility for valid_signature --- lib/gitlab/gpg/invalid_gpg_signature_updater.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/gitlab/gpg') diff --git a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb index 7bdf6760295..e085eab26c9 100644 --- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb +++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb @@ -6,15 +6,9 @@ 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 = ? OR verification_status <> ?', - false, - GpgSignature.verification_statuses[:verified] - ) + .where('gpg_key_id IS NULL OR verification_status <> ?', GpgSignature.verification_statuses[:verified]) .where(gpg_key_primary_keyid: @gpg_key.primary_keyid) .find_each { |sig| sig.gpg_commit.update_signature!(sig) } end -- cgit v1.2.1