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
5ac25eb5
Commit
5ac25eb5
authored
Dec 23, 2020
by
Daniel Tian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix vulnerability scanners GraphQL
parent
413d2a37
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
11 deletions
+9
-11
app/assets/javascripts/vue_shared/components/commit.vue
app/assets/javascripts/vue_shared/components/commit.vue
+1
-1
ee/app/assets/javascripts/security_dashboard/components/first_class_project_security_dashboard.vue
...ard/components/first_class_project_security_dashboard.vue
+4
-6
ee/app/assets/javascripts/security_dashboard/graphql/project_specific_scanners.query.graphql
...dashboard/graphql/project_specific_scanners.query.graphql
+2
-2
ee/spec/frontend/dependencies/components/dependency_location_spec.js
...ntend/dependencies/components/dependency_location_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/commit.vue
View file @
5ac25eb5
...
...
@@ -107,7 +107,7 @@ export default {
},
computed
:
{
/**
* Determines if we shoud render the ref info section based
* Determines if we shou
l
d render the ref info section based
*/
shouldShowRefInfo
()
{
return
this
.
showRefInfo
&&
(
this
.
commitRef
||
this
.
mergeRequestRef
);
...
...
ee/app/assets/javascripts/security_dashboard/components/first_class_project_security_dashboard.vue
View file @
5ac25eb5
...
...
@@ -11,8 +11,6 @@ import Filters from './first_class_vulnerability_filters.vue';
import
CsvExportButton
from
'
./csv_export_button.vue
'
;
import
{
vulnerabilitiesSeverityCountScopes
}
from
'
../constants
'
;
export
const
BANNER_COOKIE_KEY
=
'
hide_vulnerabilities_introduction_banner
'
;
export
default
{
components
:
{
AutoFixUserCallout
,
...
...
@@ -43,11 +41,11 @@ export default {
},
},
data
()
{
const
shoudShowAutoFixUserCallout
=
const
shou
l
dShowAutoFixUserCallout
=
this
.
glFeatures
.
securityAutoFix
&&
!
Cookies
.
get
(
'
auto_fix_user_callout_dismissed
'
);
return
{
filters
:
{},
shoudShowAutoFixUserCallout
,
shou
l
dShowAutoFixUserCallout
,
};
},
methods
:
{
...
...
@@ -56,7 +54,7 @@ export default {
},
handleAutoFixUserCalloutClose
()
{
Cookies
.
set
(
'
auto_fix_user_callout_dismissed
'
,
'
true
'
);
this
.
shoudShowAutoFixUserCallout
=
false
;
this
.
shou
l
dShowAutoFixUserCallout
=
false
;
},
},
vulnerabilitiesSeverityCountScopes
,
...
...
@@ -67,7 +65,7 @@ export default {
<div>
<template
v-if=
"pipeline.id"
>
<auto-fix-user-callout
v-if=
"shoudShowAutoFixUserCallout"
v-if=
"shou
l
dShowAutoFixUserCallout"
:help-page-path=
"autoFixDocumentation"
@
close=
"handleAutoFixUserCalloutClose"
/>
...
...
ee/app/assets/javascripts/security_dashboard/graphql/project_specific_scanners.query.graphql
View file @
5ac25eb5
#import "./vulnerability_scanner.fragment.graphql"
query
projectSpecificScanners
(
$full
p
ath
:
ID
!)
{
project
(
fullPath
:
$full
p
ath
)
{
query
projectSpecificScanners
(
$full
P
ath
:
ID
!)
{
project
(
fullPath
:
$full
P
ath
)
{
vulnerabilityScanners
{
nodes
{
...
VulnerabilityScanner
...
...
ee/spec/frontend/dependencies/components/dependency_location_spec.js
View file @
5ac25eb5
...
...
@@ -52,11 +52,11 @@ describe('Dependency Location component', () => {
});
});
it
(
'
shoud render the popover
'
,
()
=>
{
it
(
'
shou
l
d render the popover
'
,
()
=>
{
expect
(
findPopover
().
exists
()).
toBe
(
true
);
});
it
(
'
shoud have the complete path
'
,
()
=>
{
it
(
'
shou
l
d have the complete path
'
,
()
=>
{
expect
(
trimText
(
findPopover
().
text
())).
toBe
(
'
swell 1.2 / emmajsq 10.11 / zeb 12.1 / post 2.5 / core 1.0 There may be multiple paths
'
,
);
...
...
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