Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 8 deletions

diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue
index aafa5a2d0ba..3957547556c 100644
--- a/app/assets/javascripts/static_site_editor/components/edit_area.vue
+++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue
@@ -1,20 +1,14 @@
 <script>
-import { GlFormTextarea } from '@gitlab/ui';
-
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-
 import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue';
 import PublishToolbar from '../components/publish_toolbar.vue';
 import EditHeader from '../components/edit_header.vue';
 
 export default {
   components: {
-    GlFormTextarea,
     RichContentEditor,
     PublishToolbar,
     EditHeader,
   },
-  mixins: [glFeatureFlagsMixin()],
   props: {
     title: {
       type: String,
@@ -55,8 +49,7 @@ export default {
 <template>
   <div class="d-flex flex-grow-1 flex-column">
     <edit-header class="py-2" :title="title" />
-    <rich-content-editor v-if="glFeatures.richContentEditor" v-model="editableContent" />
-    <gl-form-textarea v-else v-model="editableContent" class="h-100 shadow-none" />
+    <rich-content-editor v-model="editableContent" class="mb-9" />
     <publish-toolbar
       class="gl-fixed gl-left-0 gl-bottom-0 gl-w-full"
       :return-url="returnUrl"