diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-30 18:12:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-30 18:12:24 +0300 |
| commit | eaec42f9e37fe51f9c53fa7079639ec9f4c40efc (patch) | |
| tree | 2abbab9659bc8e043b2dbb9dcf797a5aab717767 /lib/gitlab/ci/reports | |
| parent | 4e8c8922da341914b9fd5570ec9ce7a29ffdfebd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/reports')
| -rw-r--r-- | lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb b/lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb index 6cb2e0ddb33..4be4cf62e7b 100644 --- a/lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb +++ b/lib/gitlab/ci/reports/security/vulnerability_reports_comparer.rb @@ -80,6 +80,8 @@ module Gitlab matcher = FindingMatcher.new(head_findings) base_findings.each do |base_finding| + next if base_finding.requires_manual_resolution? + matched_head_finding = matcher.find_and_remove_match!(base_finding) @fixed_findings << base_finding if matched_head_finding.nil? |