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
e3705213
Commit
e3705213
authored
Jan 29, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed typo check for `unaproved` in sast:container report
parent
476c193c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
19 deletions
+6
-19
changelogs/unreleased-ee/4332-unapproved-check.yml
changelogs/unreleased-ee/4332-unapproved-check.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-4
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
.../javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
+0
-15
No files found.
changelogs/unreleased-ee/4332-unapproved-check.yml
0 → 100644
View file @
e3705213
---
title
:
Remove unaproved typo check in sast:container report
merge_request
:
author
:
type
:
other
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
e3705213
...
...
@@ -90,10 +90,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this
.
dockerReport
.
vulnerabilities
=
parsedVulnerabilities
||
[];
// There is a typo in the original repo:
// https://github.com/arminc/clair-scanner/pull/39/files
// Fix this when the above PR is accepted
const
unapproved
=
data
.
unapproved
||
data
.
unaproved
||
[];
const
unapproved
=
data
.
unapproved
||
[];
// Approved can be calculated by subtracting unapproved from vulnerabilities.
this
.
dockerReport
.
approved
=
parsedVulnerabilities
...
...
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
View file @
e3705213
...
...
@@ -145,21 +145,6 @@ describe('MergeRequestStore', () => {
expect
(
store
.
dockerReport
.
approved
).
toEqual
(
dockerReportParsed
.
approved
);
expect
(
store
.
dockerReport
.
unapproved
).
toEqual
(
dockerReportParsed
.
unapproved
);
});
it
(
'
handles unaproved typo
'
,
()
=>
{
store
.
setDockerReport
({
vulnerabilities
:
[
{
vulnerability
:
'
CVE-2017-12944
'
,
namespace
:
'
debian:8
'
,
severity
:
'
Medium
'
,
},
],
unaproved
:
[
'
CVE-2017-12944
'
],
});
expect
(
store
.
dockerReport
.
unapproved
[
0
].
vulnerability
).
toEqual
(
'
CVE-2017-12944
'
);
});
});
describe
(
'
parseDockerVulnerabilities
'
,
()
=>
{
...
...
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