diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-02 18:16:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-02 18:16:07 +0300 |
commit | f38683df1f619b2a1960e1415b9326354a4b5327 (patch) | |
tree | 23d469a81d3d1866a2ab71ba406aa84cd954f99a /app/assets/javascripts/issues | |
parent | 5bc7c18ad37cde0ffdf1aa4ba2cee27c92ec69f6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issues')
-rw-r--r-- | app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue index 4790062ab7d..04ddc7f3501 100644 --- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue +++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue @@ -5,6 +5,7 @@ import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; import { s__ } from '~/locale'; import Tracking from '~/tracking'; import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import DescriptionComponent from '../description.vue'; import getAlert from './graphql/queries/get_alert.graphql'; import HighlightBar from './highlight_bar.vue'; @@ -17,7 +18,10 @@ export default { GlTabs, HighlightBar, MetricsTab: () => import('ee_component/issues/show/components/incidents/metrics_tab.vue'), + TimelineTab: () => + import('ee_component/issues/show/components/incidents/timeline_events_tab.vue'), }, + mixins: [glFeatureFlagsMixin()], inject: ['fullPath', 'iid', 'uploadMetricsFeatureAvailable'], apollo: { alert: { @@ -47,6 +51,9 @@ export default { loading() { return this.$apollo.queries.alert.loading; }, + incidentTabEnabled() { + return this.glFeatures.incidentTimelineEvents && this.glFeatures.incidentTimelineEventTab; + }, }, mounted() { this.trackPageViews(); @@ -76,6 +83,7 @@ export default { > <alert-details-table :alert="alert" :loading="loading" /> </gl-tab> + <timeline-tab v-if="incidentTabEnabled" data-testid="timeline-events-tab" /> </gl-tabs> </div> </template> |