Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 1 deletions

diff --git a/app/assets/javascripts/editor/components/source_editor_toolbar_button.vue b/app/assets/javascripts/editor/components/source_editor_toolbar_button.vue
index 8c37ed1642c..e440feb5a22 100644
--- a/app/assets/javascripts/editor/components/source_editor_toolbar_button.vue
+++ b/app/assets/javascripts/editor/components/source_editor_toolbar_button.vue
@@ -31,6 +31,13 @@ export default {
       return Object.entries(this.button).length > 0;
     },
   },
+  mounted() {
+    if (this.button.data) {
+      Object.entries(this.button.data).forEach(([attr, value]) => {
+        this.$el.dataset[attr] = value;
+      });
+    }
+  },
   methods: {
     clickHandler(event) {
       if (this.button.onClick) {
@@ -52,7 +59,6 @@ export default {
     :icon="icon"
     :title="label"
     :aria-label="label"
-    data-qa-selector="editor_toolbar_button"
     @click="clickHandler($event)"
   />
 </template>
diff --git a/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js b/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js
index dd4a7a689d7..58ddaa94d5e 100644
--- a/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js
+++ b/app/assets/javascripts/editor/extensions/source_editor_markdown_livepreview_ext.js
@@ -120,6 +120,9 @@ export class EditorMarkdownPreviewExtension {
         category: 'primary',
         selectedLabel: EXTENSION_MARKDOWN_HIDE_PREVIEW_LABEL,
         onClick: () => instance.togglePreview(),
+        data: {
+          qaSelector: 'editor_toolbar_button',
+        },
       },
     ];
     instance.toolbar.addItems(this.toolbarButtons);