diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 03:10:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 03:10:55 +0300 |
| commit | 198460d5879a516844f81f667c6bc4fe84ed1719 (patch) | |
| tree | cd6e50aec1232500dc4486adf2cb8dd28c8ac378 /app/models | |
| parent | 9579eee8954e0405c2dadb19c2a73c9597ce37ea (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/vulnerability_finding_helpers.rb | 2 | ||||
| -rw-r--r-- | app/models/packages/package.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/vulnerability_finding_helpers.rb b/app/models/concerns/vulnerability_finding_helpers.rb index b5d48260072..1e8a290c050 100644 --- a/app/models/concerns/vulnerability_finding_helpers.rb +++ b/app/models/concerns/vulnerability_finding_helpers.rb @@ -49,7 +49,7 @@ module VulnerabilityFindingHelpers finding_data = report_finding.to_hash.except(:compare_key, :identifiers, :location, :scanner, :links, :signatures, :flags, :evidence) - identifiers = report_finding.identifiers.map do |identifier| + identifiers = report_finding.identifiers.uniq(&:fingerprint).map do |identifier| Vulnerabilities::Identifier.new(identifier.to_hash.merge({ project: project })) end signatures = report_finding.signatures.map do |signature| diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb index c6e8ff6c3fa..c5da647eea5 100644 --- a/app/models/packages/package.rb +++ b/app/models/packages/package.rb @@ -279,6 +279,7 @@ class Packages::Package < ApplicationRecord project.packages .preload_pipelines .including_tags + .displayable .with_name(name) .where.not(version: version) .with_package_type(package_type) |