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
3f4705c1
Commit
3f4705c1
authored
Jan 26, 2021
by
Tetiana Chupryna
Committed by
Kamil Trzciński
Jan 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag autofix indicator [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
82939e72
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
57 deletions
+8
-57
ee/app/assets/javascripts/security_dashboard/components/project_vulnerabilities.vue
...security_dashboard/components/project_vulnerabilities.vue
+1
-6
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
...ard/graphql/queries/project_vulnerabilities.query.graphql
+7
-0
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities_autofix.query.graphql
...hql/queries/project_vulnerabilities_autofix.query.graphql
+0
-39
ee/app/controllers/projects/security/vulnerability_report_controller.rb
...lers/projects/security/vulnerability_report_controller.rb
+0
-4
ee/config/feature_flags/development/secure_vulnerability_autofix_indicator.yml
...gs/development/secure_vulnerability_autofix_indicator.yml
+0
-8
No files found.
ee/app/assets/javascripts/security_dashboard/components/project_vulnerabilities.vue
View file @
3f4705c1
...
@@ -4,15 +4,10 @@ import produce from 'immer';
...
@@ -4,15 +4,10 @@ import produce from 'immer';
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
securityScannersQuery
from
'
../graphql/queries/project_security_scanners.query.graphql
'
;
import
securityScannersQuery
from
'
../graphql/queries/project_security_scanners.query.graphql
'
;
import
vulnerabilitiesQuery
from
'
../graphql/queries/project_vulnerabilities.query.graphql
'
;
import
vulnerabilitiesQuery
from
'
../graphql/queries/project_vulnerabilities.query.graphql
'
;
import
vulnerabilitiesQueryAutoFix
from
'
../graphql/queries/project_vulnerabilities_autofix.query.graphql
'
;
import
{
preparePageInfo
}
from
'
../helpers
'
;
import
{
preparePageInfo
}
from
'
../helpers
'
;
import
{
VULNERABILITIES_PER_PAGE
}
from
'
../store/constants
'
;
import
{
VULNERABILITIES_PER_PAGE
}
from
'
../store/constants
'
;
import
VulnerabilityList
from
'
./vulnerability_list.vue
'
;
import
VulnerabilityList
from
'
./vulnerability_list.vue
'
;
const
query
=
gon
?.
features
?.
secureVulnerabilityAutofixIndicator
?
vulnerabilitiesQueryAutoFix
:
vulnerabilitiesQuery
;
export
default
{
export
default
{
name
:
'
ProjectVulnerabilitiesApp
'
,
name
:
'
ProjectVulnerabilitiesApp
'
,
components
:
{
components
:
{
...
@@ -41,7 +36,7 @@ export default {
...
@@ -41,7 +36,7 @@ export default {
},
},
apollo
:
{
apollo
:
{
vulnerabilities
:
{
vulnerabilities
:
{
query
,
query
:
vulnerabilitiesQuery
,
variables
()
{
variables
()
{
return
{
return
{
fullPath
:
this
.
projectFullPath
,
fullPath
:
this
.
projectFullPath
,
...
...
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
View file @
3f4705c1
...
@@ -23,6 +23,13 @@ query project(
...
@@ -23,6 +23,13 @@ query project(
)
{
)
{
nodes
{
nodes
{
...
Vulnerability
...
Vulnerability
hasSolutions
mergeRequest
{
webUrl
state
securityAutoFix
iid
}
}
}
pageInfo
{
pageInfo
{
...
PageInfo
...
PageInfo
...
...
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities_autofix.query.graphql
deleted
100644 → 0
View file @
82939e72
#import "~/graphql_shared/fragments/pageInfoCursorsOnly.fragment.graphql"
#import "../fragments/vulnerability.fragment.graphql"
query
project
(
$fullPath
:
ID
!
$after
:
String
$first
:
Int
$severity
:
[
VulnerabilitySeverity
!]
$reportType
:
[
VulnerabilityReportType
!]
$scanner
:
[
String
!]
$state
:
[
VulnerabilityState
!]
$sort
:
VulnerabilitySort
)
{
project
(
fullPath
:
$fullPath
)
{
vulnerabilities
(
after
:
$after
first
:
$first
severity
:
$severity
reportType
:
$reportType
scanner
:
$scanner
state
:
$state
sort
:
$sort
)
{
nodes
{
...
Vulnerability
hasSolutions
mergeRequest
{
webUrl
state
securityAutoFix
iid
}
}
pageInfo
{
...
PageInfo
}
}
}
}
ee/app/controllers/projects/security/vulnerability_report_controller.rb
View file @
3f4705c1
...
@@ -5,10 +5,6 @@ module Projects
...
@@ -5,10 +5,6 @@ module Projects
class
VulnerabilityReportController
<
Projects
::
ApplicationController
class
VulnerabilityReportController
<
Projects
::
ApplicationController
include
SecurityDashboardsPermissions
include
SecurityDashboardsPermissions
before_action
do
push_frontend_feature_flag
(
:secure_vulnerability_autofix_indicator
,
@project
,
default_enabled:
true
)
end
feature_category
:vulnerability_management
feature_category
:vulnerability_management
alias_method
:vulnerable
,
:project
alias_method
:vulnerable
,
:project
...
...
ee/config/feature_flags/development/secure_vulnerability_autofix_indicator.yml
deleted
100644 → 0
View file @
82939e72
---
name
:
secure_vulnerability_autofix_indicator
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48251/
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/288347
milestone
:
'
13.7'
type
:
development
group
:
group::composition analysis
default_enabled
:
true
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