Commit d84d237b authored by Vitali Tatarintev's avatar Vitali Tatarintev Committed by Sean McGivern

Rename incident_timeline_event_tab FF to incident_timeline

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