diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 21:12:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 21:12:09 +0300 |
| commit | 4612d16c2d2dad7ef582bdd6878f02b98e6a84b7 (patch) | |
| tree | 70bdc05b7d7ebac6a2b92327dc7a5e41fd2f69b1 /app/assets/javascripts/content_editor | |
| parent | 485728af8d6692d2df36f340b896dea79939ae0c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/content_editor')
| -rw-r--r-- | app/assets/javascripts/content_editor/components/content_editor.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index c24186ae406..05d6f468d23 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -105,7 +105,11 @@ export default { <code-block-bubble-menu /> <link-bubble-menu /> <media-bubble-menu /> - <tiptap-editor-content class="md" :editor="contentEditor.tiptapEditor" /> + <tiptap-editor-content + class="md" + data-testid="content_editor_editablebox" + :editor="contentEditor.tiptapEditor" + /> <loading-indicator /> </div> </div> |