Merge branch '225254-remove-feature-flag' into 'master'

Remove auto close incident FF

Closes #225254

See merge request gitlab-org/gitlab!40612

app/assets/javascripts/incidents_settings/components/alerts_form.vue

@@ -9,7 +9,6 @@ import {
   GlNewDropdown,
   GlNewDropdownItem,
 } from '@gitlab/ui';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   I18N_ALERT_SETTINGS_FORM,
   NO_ISSUE_TEMPLATE_SELECTED,
@@ -28,7 +27,6 @@ export default {
     GlNewDropdown,
     GlNewDropdownItem,
   },
-  mixins: [glFeatureFlagsMixin()],
   inject: ['service', 'alertSettings'],
   data() {
     return {
@@ -127,7 +125,7 @@ export default {
           <span>{{ $options.i18n.sendEmail.label }}</span>
         </gl-form-checkbox>
       </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">
           <span>{{ $options.i18n.autoCloseIncidents.label }}</span>
         </gl-form-checkbox>

app/controllers/projects/settings/operations_controller.rb

@@ -6,10 +6,6 @@ module Projects
       before_action :authorize_admin_operations!
       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]
 
       helper_method :error_tracking_setting

changelogs/unreleased/225254-remove-feature-flag.yml

+---
+title: Remove auto close incident feature flag
+merge_request: 40612
+author:
+type: changed

spec/frontend/incidents_settings/components/alerts_form_spec.js

@@ -10,7 +10,6 @@ describe('Alert integration settings form', () => {
   beforeEach(() => {
     wrapper = shallowMount(AlertsSettingsForm, {
       provide: {
-        glFeatures: { autoCloseIncident: true },
         service,
         alertSettings: {
           issueTemplateKey: 'selecte_tmpl',