Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
71ec3c49
Commit
71ec3c49
authored
Jun 18, 2020
by
Michał Zając
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rely only on vulnerability object
parent
c9517154
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
18 deletions
+11
-18
ee/app/assets/javascripts/pages/projects/security/vulnerabilities/show/index.js
...pts/pages/projects/security/vulnerabilities/show/index.js
+2
-3
ee/app/assets/javascripts/vulnerabilities/components/details.vue
...assets/javascripts/vulnerabilities/components/details.vue
+3
-3
ee/app/assets/javascripts/vulnerabilities/components/footer.vue
.../assets/javascripts/vulnerabilities/components/footer.vue
+6
-12
No files found.
ee/app/assets/javascripts/pages/projects/security/vulnerabilities/show/index.js
View file @
71ec3c49
...
...
@@ -59,10 +59,9 @@ function createFooterApp() {
const
props
=
{
discussionsUrl
,
notesUrl
,
finding
,
solutionInfo
:
{
solution
:
finding
.
solution
,
remediation
:
finding
.
remediation
,
solution
,
remediation
,
hasDownload
,
hasMr
,
hasRemediation
,
...
...
ee/app/assets/javascripts/vulnerabilities/components/details.vue
View file @
71ec3c49
...
...
@@ -17,7 +17,7 @@ export default {
return
this
.
vulnerability
.
location
||
{};
},
scanner
()
{
return
this
.
finding
.
scanner
||
{};
return
this
.
vulnerability
.
scanner
||
{};
},
fileText
()
{
return
(
this
.
location
.
file
||
''
)
+
(
this
.
lineNumber
?
`:
${
this
.
lineNumber
}
`
:
''
);
...
...
@@ -63,9 +63,9 @@ export default {
<severity-badge
:severity=
"vulnerability.severity"
class=
"gl-display-inline ml-1"
/>
</detail-item>
<detail-item
v-if=
"
finding
.evidence"
v-if=
"
vulnerability
.evidence"
:sprintf-message=
"__('%
{labelStart}Evidence:%{labelEnd} %{evidence}')"
>
{{
finding
.
evidence
}}
>
{{
vulnerability
.
evidence
}}
</detail-item>
<detail-item
:sprintf-message=
"__('%
{labelStart}Report Type:%{labelEnd} %{reportType}')"
>
{{
vulnerability
.
report_type
}}
...
...
ee/app/assets/javascripts/vulnerabilities/components/footer.vue
View file @
71ec3c49
...
...
@@ -22,7 +22,7 @@ export default {
type
:
String
,
required
:
true
,
},
finding
:
{
project
:
{
type
:
Object
,
required
:
true
,
},
...
...
@@ -52,12 +52,6 @@ export default {
hasSolution
()
{
return
Boolean
(
this
.
solutionInfo
.
solution
||
this
.
solutionInfo
.
remediation
);
},
project
()
{
return
{
url
:
this
.
finding
.
project
?.
full_path
,
value
:
this
.
finding
.
project
?.
full_name
,
};
},
},
created
()
{
...
...
@@ -156,16 +150,16 @@ export default {
<div
data-qa-selector=
"vulnerability_footer"
>
<solution-card
v-if=
"hasSolution"
v-bind=
"solutionInfo"
/>
<div
v-if=
"
finding.issue_feedback || finding
.merge_request_feedback"
class=
"card"
>
<div
v-if=
"
project.issue_feedback || project
.merge_request_feedback"
class=
"card"
>
<issue-note
v-if=
"
finding
.issue_feedback"
:feedback=
"
finding
.issue_feedback"
v-if=
"
project
.issue_feedback"
:feedback=
"
project
.issue_feedback"
:project=
"project"
class=
"card-body"
/>
<merge-request-note
v-if=
"
finding
.merge_request_feedback"
:feedback=
"
finding
.merge_request_feedback"
v-if=
"
project
.merge_request_feedback"
:feedback=
"
project
.merge_request_feedback"
:project=
"project"
class=
"card-body"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment