Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 24 insertions, 0 deletions

diff --git a/app/assets/javascripts/content_editor/components/content_editor_provider.vue b/app/assets/javascripts/content_editor/components/content_editor_provider.vue
new file mode 100644
index 00000000000..630aff9858f
--- /dev/null
+++ b/app/assets/javascripts/content_editor/components/content_editor_provider.vue
@@ -0,0 +1,24 @@
+<script>
+export default {
+  provide() {
+    // We can't use this.contentEditor due to bug in vue-apollo when
+    // provide is called in beforeCreate
+    // See https://github.com/vuejs/vue-apollo/pull/1153 for details
+    const { contentEditor } = this.$options.propsData;
+
+    return {
+      contentEditor,
+      tiptapEditor: contentEditor.tiptapEditor,
+    };
+  },
+  props: {
+    contentEditor: {
+      type: Object,
+      required: true,
+    },
+  },
+  render() {
+    return this.$slots.default;
+  },
+};
+</script>