Commit 5587cf3f authored by Sean McGivern's avatar Sean McGivern

Merge branch '216651-download-patch-sav-be' into 'master'

Add merge request feedback for vulnerability finding data

See merge request gitlab-org/gitlab!31498
parents 790793d9 e81c9231
...@@ -39,6 +39,7 @@ module VulnerabilitiesHelper ...@@ -39,6 +39,7 @@ module VulnerabilitiesHelper
:location, :location,
:name, :name,
:issue_feedback, :issue_feedback,
:merge_request_feedback,
:project :project
).merge( ).merge(
solution: remediation ? remediation['summary'] : occurrence[:solution] solution: remediation ? remediation['summary'] : occurrence[:solution]
......
...@@ -108,6 +108,7 @@ describe VulnerabilitiesHelper do ...@@ -108,6 +108,7 @@ describe VulnerabilitiesHelper do
description: finding.description, description: finding.description,
identifiers: kind_of(Array), identifiers: kind_of(Array),
issue_feedback: anything, issue_feedback: anything,
merge_request_feedback: anything,
links: finding.links, links: finding.links,
location: finding.location, location: finding.location,
name: finding.name, name: finding.name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment