Commit c8952ec0 authored by David O'Regan's avatar David O'Regan Committed by Natalia Tepluhina

Remove auto close incident FF

We remove the feature flag which was
hiding the autoclose incidents option
now that the backend is live.
parent 8a830f5e
...@@ -9,7 +9,6 @@ import { ...@@ -9,7 +9,6 @@ import {
GlNewDropdown, GlNewDropdown,
GlNewDropdownItem, GlNewDropdownItem,
} from '@gitlab/ui'; } from '@gitlab/ui';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { import {
I18N_ALERT_SETTINGS_FORM, I18N_ALERT_SETTINGS_FORM,
NO_ISSUE_TEMPLATE_SELECTED, NO_ISSUE_TEMPLATE_SELECTED,
...@@ -28,7 +27,6 @@ export default { ...@@ -28,7 +27,6 @@ export default {
GlNewDropdown, GlNewDropdown,
GlNewDropdownItem, GlNewDropdownItem,
}, },
mixins: [glFeatureFlagsMixin()],
inject: ['service', 'alertSettings'], inject: ['service', 'alertSettings'],
data() { data() {
return { return {
...@@ -127,7 +125,7 @@ export default { ...@@ -127,7 +125,7 @@ export default {
<span>{{ $options.i18n.sendEmail.label }}</span> <span>{{ $options.i18n.sendEmail.label }}</span>
</gl-form-checkbox> </gl-form-checkbox>
</gl-form-group> </gl-form-group>
<gl-form-group v-if="glFeatures.autoCloseIncident" class="gl-pl-0 gl-mb-5"> <gl-form-group class="gl-pl-0 gl-mb-5">
<gl-form-checkbox v-model="autoCloseIncident"> <gl-form-checkbox v-model="autoCloseIncident">
<span>{{ $options.i18n.autoCloseIncidents.label }}</span> <span>{{ $options.i18n.autoCloseIncidents.label }}</span>
</gl-form-checkbox> </gl-form-checkbox>
......
...@@ -6,10 +6,6 @@ module Projects ...@@ -6,10 +6,6 @@ module Projects
before_action :authorize_admin_operations! before_action :authorize_admin_operations!
before_action :authorize_read_prometheus_alerts!, only: [:reset_alerting_token] before_action :authorize_read_prometheus_alerts!, only: [:reset_alerting_token]
before_action do
push_frontend_feature_flag(:auto_close_incident)
end
respond_to :json, only: [:reset_alerting_token, :reset_pagerduty_token] respond_to :json, only: [:reset_alerting_token, :reset_pagerduty_token]
helper_method :error_tracking_setting helper_method :error_tracking_setting
......
---
title: Remove auto close incident feature flag
merge_request: 40612
author:
type: changed
...@@ -10,7 +10,6 @@ describe('Alert integration settings form', () => { ...@@ -10,7 +10,6 @@ describe('Alert integration settings form', () => {
beforeEach(() => { beforeEach(() => {
wrapper = shallowMount(AlertsSettingsForm, { wrapper = shallowMount(AlertsSettingsForm, {
provide: { provide: {
glFeatures: { autoCloseIncident: true },
service, service,
alertSettings: { alertSettings: {
issueTemplateKey: 'selecte_tmpl', issueTemplateKey: 'selecte_tmpl',
......
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