diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-10-07 19:16:18 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-10-07 19:16:18 +0000 |
| commit | 01d7335b43256867ab8cc05c0e14844c9faeb916 (patch) | |
| tree | 331da0dbc62a970fc4b87a7e4efe5480eb288c62 /lib | |
| parent | 3e96288aa4715658c055894513fb640d3637b933 (diff) | |
| parent | 4aa2deb4782f1f3b516bfaecdb57203765bbb123 (diff) | |
| download | gitlab-ce-01d7335b43256867ab8cc05c0e14844c9faeb916.tar.gz | |
Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into 'master'
Fix error with GPG signature updater when commit was deleted
Closes #38890
See merge request gitlab-org/gitlab-ce!14749
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gpg/invalid_gpg_signature_updater.rb | 2 |
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 b7fb9dde2bc..1991911ef6a 100644 --- a/lib/gitlab/gpg/invalid_gpg_signature_updater.rb +++ b/lib/gitlab/gpg/invalid_gpg_signature_updater.rb @@ -10,7 +10,7 @@ module Gitlab .select(:id, :commit_sha, :project_id) .where('gpg_key_id IS NULL OR verification_status <> ?', GpgSignature.verification_statuses[:verified]) .where(gpg_key_primary_keyid: @gpg_key.keyids) - .find_each { |sig| sig.gpg_commit.update_signature!(sig) } + .find_each { |sig| sig.gpg_commit&.update_signature!(sig) } end end end |