Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 13 deletions

diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 01a00e03814..89e40faa23e 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -6,7 +6,6 @@ import { GlLoadingIcon } from '@gitlab/ui';
 import { flow, reverse, sortBy } from 'lodash/fp';
 import environmentTableMixin from 'ee_else_ce/environments/mixins/environments_table_mixin';
 import { s__ } from '~/locale';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import EnvironmentItem from './environment_item.vue';
 
 export default {
@@ -17,7 +16,7 @@ export default {
     CanaryDeploymentCallout: () =>
       import('ee_component/environments/components/canary_deployment_callout.vue'),
   },
-  mixins: [environmentTableMixin, glFeatureFlagsMixin()],
+  mixins: [environmentTableMixin],
   props: {
     environments: {
       type: Array,
@@ -43,9 +42,6 @@ export default {
           : env,
       );
     },
-    shouldShowAutoStopDate() {
-      return this.glFeatures.autoStopEnvironments;
-    },
     tableData() {
       return {
         // percent spacing for cols, should add up to 100
@@ -74,7 +70,7 @@ export default {
           spacing: 'section-5',
         },
         actions: {
-          spacing: this.shouldShowAutoStopDate ? 'section-25' : 'section-30',
+          spacing: 'section-25',
         },
       };
     },
@@ -131,12 +127,7 @@ export default {
       <div class="table-section" :class="tableData.date.spacing" role="columnheader">
         {{ tableData.date.title }}
       </div>
-      <div
-        v-if="shouldShowAutoStopDate"
-        class="table-section"
-        :class="tableData.autoStop.spacing"
-        role="columnheader"
-      >
+      <div class="table-section" :class="tableData.autoStop.spacing" role="columnheader">
         {{ tableData.autoStop.title }}
       </div>
     </div>
@@ -146,7 +137,6 @@ export default {
         :key="`environment-item-${i}`"
         :model="model"
         :can-read-environment="canReadEnvironment"
-        :should-show-auto-stop-date="shouldShowAutoStopDate"
         :table-data="tableData"
       />