Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-07-06 12:15:31 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2017-07-27 16:43:37 +0300
commitb66e3726dc377c2bb5c92983db4ec4c8d27237c4 (patch)
tree109dad78823663104daa8f63862c0c3a89211672 /lib/gitlab/gpg
parent7f03282f0ff45948d3d27efe007ba77e24e19fa5 (diff)
also update gpg_signatures when gpg_key is null
Diffstat (limited to 'lib/gitlab/gpg')
-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 860e1e1035c..1782e20dcab 100644
--- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
+++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb
@@ -7,7 +7,7 @@ module Gitlab
def run
GpgSignature
- .where(valid_signature: false)
+ .where('gpg_key_id IS NULL OR valid_signature = ?', false)
.where(gpg_key_primary_keyid: @gpg_key.primary_keyid)
.find_each do |gpg_signature|
Gitlab::Gpg::Commit.new(gpg_signature.commit).update_signature!(gpg_signature)