Merge branch '257842-issue-incident-feature-flag-removal' into 'master'

Remove issue Incident feature flag

See merge request gitlab-org/gitlab!44438

app/assets/javascripts/incidents/components/incidents_list.vue

@@ -19,7 +19,6 @@ import Api from '~/api';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { convertToSnakeCase } from '~/lib/utils/text_utility';
 import { s__, __ } from '~/locale';
 import { urlParamsToObject } from '~/lib/utils/common_utils';
@@ -113,7 +112,6 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [glFeatureFlagsMixin()],
   inject: [
     'projectPath',
     'newIssuePath',
@@ -335,10 +333,7 @@ export default {
       return Boolean(assignees.nodes?.length);
     },
     navigateToIncidentDetails({ iid }) {
-      const path = this.glFeatures.issuesIncidentDetails
-        ? joinPaths(this.issuePath, INCIDENT_DETAILS_PATH)
-        : this.issuePath;
-      return visitUrl(joinPaths(path, iid));
+      return visitUrl(joinPaths(this.issuePath, INCIDENT_DETAILS_PATH, iid));
     },
     handlePageChange(page) {
       const { startCursor, endCursor } = this.incidents.pageInfo;

app/controllers/projects/incidents_controller.rb

@@ -5,13 +5,8 @@ class Projects::IncidentsController < Projects::ApplicationController
   include Gitlab::Utils::StrongMemoize
 
   before_action :authorize_read_issue!
-  before_action :check_feature_flag, only: [:show]
   before_action :load_incident, only: [:show]
 
-  before_action do
-    push_frontend_feature_flag(:issues_incident_details, @project)
-  end
-
   def index
   end
 
@@ -45,8 +40,4 @@ class Projects::IncidentsController < Projects::ApplicationController
   def serializer
     IssueSerializer.new(current_user: current_user, project: incident.project)
   end
-
-  def check_feature_flag
-    render_404 unless Feature.enabled?(:issues_incident_details, @project)
-  end
 end

changelogs/unreleased/257842-issue-incident-feature-flag-removal.yml

+---
+title: Allow users to navigate to the incidents show details page wrapper through `/issues/incidents/:id` from the Incident list
+merge_request: 44438
+author:
+type: changed

config/feature_flags/development/issues_incident_details.yml

----
-name: issues_incident_details
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43459
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257842
-type: development
-group: group::health
-default_enabled: false

spec/controllers/projects/incidents_controller_spec.rb

@@ -83,14 +83,6 @@ RSpec.describe Projects::IncidentsController do
       expect(assigns(:noteable)).to eq(assigns(:incident))
     end
 
-    context 'with feature flag disabled' do
-      before do
-        stub_feature_flags(issues_incident_details: false)
-      end
-
-      it_behaves_like 'not found'
-    end
-
     context 'with non existing id' do
       let(:resource) { non_existing_record_id }
 

spec/frontend/incidents/components/incidents_list_spec.js

@@ -87,7 +87,6 @@ describe('Incidents List', () => {
         textQuery: '',
         authorUsernamesQuery: '',
         assigneeUsernamesQuery: '',
-        issuesIncidentDetails: false,
       },
       stubs: {
         GlButton: true,
@@ -194,22 +193,7 @@ describe('Incidents List', () => {
       expect(findSeverity().length).toBe(mockIncidents.length);
     });
 
-    it('contains a link to the issue details page', () => {
-      findTableRows()
-        .at(0)
-        .trigger('click');
-      expect(visitUrl).toHaveBeenCalledWith(joinPaths(`/project/issues/`, mockIncidents[0].iid));
-    });
-
     it('contains a link to the incident details page', async () => {
-      beforeEach(() =>
-        mountComponent({
-          data: { incidents: { list: mockIncidents }, incidentsCount: {} },
-          loading: false,
-          provide: { glFeatures: { issuesIncidentDetails: true } },
-        }),
-      );
-
       findTableRows()
         .at(0)
         .trigger('click');