diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-08-31 20:43:24 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-05 12:18:33 +0200 |
| commit | b62c1620ea8d4260bb60303d4825a214c7ed56ee (patch) | |
| tree | aba652a9e6f1910593775b2b443f9850279cfb29 /lib | |
| parent | aa98c36e470eb6b11baacac9a27c72ccf3c3a5c6 (diff) | |
| download | gitlab-ce-b62c1620ea8d4260bb60303d4825a214c7ed56ee.tar.gz | |
drop backwards compatibility for valid_signature
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gpg/invalid_gpg_signature_updater.rb | 8 |
1 files changed, 1 insertions, 7 deletions
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 |