Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 7 deletions

diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue
index f7a5d31b835..1f3fdd5eef2 100644
--- a/app/assets/javascripts/alert_management/components/alert_details.vue
+++ b/app/assets/javascripts/alert_management/components/alert_details.vue
@@ -30,7 +30,6 @@ import AlertSidebar from './alert_sidebar.vue';
 import AlertMetrics from './alert_metrics.vue';
 import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';
 import AlertSummaryRow from './alert_summary_row.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 const containerEl = document.querySelector('.page-with-contextual-sidebar');
 
@@ -77,7 +76,6 @@ export default {
     SystemNote,
     AlertMetrics,
   },
-  mixins: [glFeatureFlagsMixin()],
   inject: {
     projectPath: {
       default: '',
@@ -150,13 +148,10 @@ export default {
       },
     },
     environmentName() {
-      return this.shouldDisplayEnvironment && this.alert?.environment?.name;
+      return this.alert?.environment?.name;
     },
     environmentPath() {
-      return this.shouldDisplayEnvironment && this.alert?.environment?.path;
-    },
-    shouldDisplayEnvironment() {
-      return this.glFeatures.exposeEnvironmentPathInAlertDetails;
+      return this.alert?.environment?.path;
     },
   },
   mounted() {