summaryrefslogtreecommitdiff
path: root/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2017-09-07 10:58:28 +0100
committerAndrew Newdigate <andrew@gitlab.com>2017-09-07 10:58:28 +0100
commitaee3e2bc908accad77cd5b1f4594e3da3844a34d (patch)
tree42151c8228fa52fa42ff30d9dd21ac9aa3be3603 /lib/gitlab/gpg/invalid_gpg_signature_updater.rb
parent632d6cd0306ee341271188616337d9831f097ccf (diff)
parent8f7638798dc91373c4b58d697e11f01f99a4ca6d (diff)
downloadgitlab-ce-gitaly-feature-toggles-development-opt-out.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into gitaly-feature-toggles-development-opt-outgitaly-feature-toggles-development-opt-out
Diffstat (limited to 'lib/gitlab/gpg/invalid_gpg_signature_updater.rb')
-rw-r--r--lib/gitlab/gpg/invalid_gpg_signature_updater.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
index a525ee7a9ee..e085eab26c9 100644
--- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
+++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
@@ -8,7 +8,7 @@ module Gitlab
def run
GpgSignature
.select(:id, :commit_sha, :project_id)
- .where('gpg_key_id IS NULL OR valid_signature = ?', false)
+ .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