Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 32 deletions

diff --git a/app/assets/javascripts/repository/components/blob_edit.vue b/app/assets/javascripts/repository/components/blob_edit.vue
index 69e2bd563c9..2ba0ab968bf 100644
--- a/app/assets/javascripts/repository/components/blob_edit.vue
+++ b/app/assets/javascripts/repository/components/blob_edit.vue
@@ -1,19 +1,10 @@
 <script>
-import { GlButton } from '@gitlab/ui';
-import { __ } from '~/locale';
 import WebIdeLink from '~/vue_shared/components/web_ide_link.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
-  i18n: {
-    edit: __('Edit'),
-    webIde: __('Web IDE'),
-  },
   components: {
-    GlButton,
     WebIdeLink,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     showEditButton: {
       type: Boolean,
@@ -43,7 +34,6 @@ export default {
 
 <template>
   <web-ide-link
-    v-if="glFeatures.consolidatedEditButton"
     :show-edit-button="showEditButton"
     class="gl-mr-3"
     :edit-url="editPath"
@@ -53,26 +43,4 @@ export default {
     disable-fork-modal
     @edit="onEdit"
   />
-  <div v-else>
-    <gl-button
-      v-if="showEditButton"
-      class="gl-mr-2"
-      category="primary"
-      variant="confirm"
-      data-testid="edit"
-      @click="onEdit('simple')"
-    >
-      {{ $options.i18n.edit }}
-    </gl-button>
-
-    <gl-button
-      class="gl-mr-3"
-      category="primary"
-      variant="confirm"
-      data-testid="web-ide"
-      @click="onEdit('ide')"
-    >
-      {{ $options.i18n.webIde }}
-    </gl-button>
-  </div>
 </template>