1 files changed, 0 insertions, 37 deletions

diff --git a/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue b/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
index e7f4b51c964..dde021b67be 100644
--- a/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
+++ b/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
@@ -1,10 +1,8 @@
 <script>
 import { GlAlert, GlLoadingIcon, GlToggle } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
-import axios from '~/lib/utils/axios_utils';
 import { sprintf, s__ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { LEGACY_FLAG } from '../constants';
 import FeatureFlagForm from './form.vue';
 
 export default {
@@ -15,59 +13,29 @@ export default {
     FeatureFlagForm,
   },
   mixins: [glFeatureFlagMixin()],
-  inject: {
-    showUserCallout: {},
-    userCalloutId: {
-      default: '',
-    },
-    userCalloutsPath: {
-      default: '',
-    },
-  },
-  data() {
-    return {
-      userShouldSeeNewFlagAlert: this.showUserCallout,
-    };
-  },
-  translations: {
-    legacyReadOnlyFlagAlert: s__(
-      'FeatureFlags|GitLab is moving to a new way of managing feature flags. This feature flag is read-only, and it will be removed in 14.0. Please create a new feature flag.',
-    ),
-  },
   computed: {
     ...mapState([
       'path',
       'error',
       'name',
       'description',
-      'scopes',
       'strategies',
       'isLoading',
       'hasError',
       'iid',
       'active',
-      'version',
     ]),
     title() {
       return this.iid
         ? `^${this.iid} ${this.name}`
         : sprintf(s__('Edit %{name}'), { name: this.name });
     },
-    deprecated() {
-      return this.version === LEGACY_FLAG;
-    },
   },
   created() {
     return this.fetchFeatureFlag();
   },
   methods: {
     ...mapActions(['updateFeatureFlag', 'fetchFeatureFlag', 'toggleActive']),
-    dismissNewVersionFlagAlert() {
-      this.userShouldSeeNewFlagAlert = false;
-      axios.post(this.userCalloutsPath, {
-        feature_name: this.userCalloutId,
-      });
-    },
   },
 };
 </script>
@@ -76,9 +44,6 @@ export default {
     <gl-loading-icon v-if="isLoading" size="xl" class="gl-mt-7" />
 
     <template v-else-if="!isLoading && !hasError">
-      <gl-alert v-if="deprecated" variant="warning" :dismissible="false" class="gl-my-5">{{
-        $options.translations.legacyReadOnlyFlagAlert
-      }}</gl-alert>
       <div class="gl-display-flex gl-align-items-center gl-mb-4 gl-mt-4">
         <gl-toggle
           :value="active"
@@ -100,12 +65,10 @@ export default {
       <feature-flag-form
         :name="name"
         :description="description"
-        :scopes="scopes"
         :strategies="strategies"
         :cancel-path="path"
         :submit-text="__('Save changes')"
         :active="active"
-        :version="version"
         @handleSubmit="(data) => updateFeatureFlag(data)"
       />
     </template>