Commit 5a0af135 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'ck3g-rename-incident_timeline_event_tab-feature-flag' into 'master'

Rename incident_timeline_event_tab FF to incident_timeline

See merge request gitlab-org/gitlab!83078
parents de4a62d8 d84d237b
......@@ -52,7 +52,7 @@ export default {
return this.$apollo.queries.alert.loading;
},
incidentTabEnabled() {
return this.glFeatures.incidentTimelineEvents && this.glFeatures.incidentTimelineEventTab;
return this.glFeatures.incidentTimelineEvents && this.glFeatures.incidentTimeline;
},
},
mounted() {
......
......@@ -8,7 +8,7 @@ class Projects::IncidentsController < Projects::ApplicationController
before_action :load_incident, only: [:show]
before_action do
push_frontend_feature_flag(:incident_escalations, @project)
push_frontend_feature_flag(:incident_timeline_event_tab, @project, default_enabled: :yaml)
push_frontend_feature_flag(:incident_timeline, @project, default_enabled: :yaml)
push_licensed_feature(:incident_timeline_events) if @project.licensed_feature_available?(:incident_timeline_events)
end
......
---
name: incident_timeline_event_tab
name: incident_timeline
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80802
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353426
milestone: '14.9'
......
......@@ -29,7 +29,7 @@ describe('Incident Tabs component', () => {
fullPath: '',
iid: '',
uploadMetricsFeatureAvailable: true,
glFeatures: { incidentTimelineEventTab: true, incidentTimelineEvents: true },
glFeatures: { incidentTimeline: true, incidentTimelineEvents: true },
},
data() {
return { alert: mockAlert, ...data };
......@@ -62,7 +62,7 @@ describe('Incident Tabs component', () => {
});
it('does not render timeline tab when feature flag is disabled', () => {
mountComponent({}, { provide: { glFeatures: { incidentTimelineEventTab: false } } });
mountComponent({}, { provide: { glFeatures: { incidentTimeline: false } } });
expect(findTimelineTab().exists()).toBe(false);
});
......
......@@ -35,7 +35,7 @@ describe('Incident Tabs component', () => {
fullPath: '',
iid: '',
uploadMetricsFeatureAvailable: true,
glFeatures: { incidentTimelineEventTab: true, incidentTimelineEvents: true },
glFeatures: { incidentTimeline: true, incidentTimelineEvents: true },
},
data() {
return { alert: mockAlert, ...data };
......
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