Commit 075120fd authored by Mark Florian's avatar Mark Florian

Merge branch 'dpisek-remove-scanner-alerts-feature-flag' into 'master'

Remove scanner alerts feature flag

See merge request gitlab-org/gitlab!43243
parents a6dbd65c 5b0599ba
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import produce from 'immer'; import produce from 'immer';
import { GlAlert, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui'; import { GlAlert, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import VulnerabilityList from './vulnerability_list.vue'; import VulnerabilityList from './vulnerability_list.vue';
import vulnerabilitiesQuery from '../graphql/project_vulnerabilities.graphql'; import vulnerabilitiesQuery from '../graphql/project_vulnerabilities.graphql';
import securityScannersQuery from '../graphql/project_security_scanners.graphql'; import securityScannersQuery from '../graphql/project_security_scanners.graphql';
...@@ -17,7 +16,6 @@ export default { ...@@ -17,7 +16,6 @@ export default {
GlIntersectionObserver, GlIntersectionObserver,
VulnerabilityList, VulnerabilityList,
}, },
mixins: [glFeatureFlagsMixin()],
props: { props: {
projectFullPath: { projectFullPath: {
type: String, type: String,
...@@ -78,9 +76,6 @@ export default { ...@@ -78,9 +76,6 @@ export default {
pipelineRun: pipelineRun.map(translateScannerName), pipelineRun: pipelineRun.map(translateScannerName),
}; };
}, },
skip() {
return !this.glFeatures.scannerAlerts;
},
}, },
}, },
computed: { computed: {
......
...@@ -9,7 +9,6 @@ module Projects ...@@ -9,7 +9,6 @@ module Projects
before_action only: [:index] do before_action only: [:index] do
push_frontend_feature_flag(:hide_dismissed_vulnerabilities) push_frontend_feature_flag(:hide_dismissed_vulnerabilities)
push_frontend_feature_flag(:scanner_alerts, default_enabled: true)
end end
end end
end end
......
---
name: scanner_alerts
introduced_by_url:
rollout_issue_url:
group:
type: development
default_enabled: true
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