Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 5 deletions

diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index 300a81caa5c..e5408d0734a 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -116,11 +116,7 @@ export default {
         class="referenced-commands draft-note-commands"
       ></div>
 
-      <p
-        v-if="!glFeatures.mrReviewSubmitComment"
-        class="draft-note-actions d-flex"
-        data-qa-selector="draft_note_content"
-      >
+      <p v-if="!glFeatures.mrReviewSubmitComment" class="draft-note-actions d-flex">
         <publish-button
           :show-count="true"
           :should-publish="false"
diff --git a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
index 612fc02668a..e48f84cae56 100644
--- a/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
+++ b/app/assets/javascripts/batch_comments/components/submit_dropdown.vue
@@ -77,6 +77,7 @@ export default {
     ref="dropdown"
     right
     class="submit-review-dropdown"
+    data-qa-selector="submit_review_dropdown"
     variant="info"
     category="secondary"
   >
@@ -133,6 +134,7 @@ export default {
           type="submit"
           class="js-no-auto-disable"
           data-testid="submit-review-button"
+          data-qa-selector="submit_review_button"
         >
           {{ __('Submit review') }}
         </gl-button>