Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 10 deletions

diff --git a/app/assets/javascripts/merge_requests/components/compare_app.vue b/app/assets/javascripts/merge_requests/components/compare_app.vue
index 20c95174989..c7c16e91e4c 100644
--- a/app/assets/javascripts/merge_requests/components/compare_app.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_app.vue
@@ -32,9 +32,6 @@ export default {
     toggleClass: {
       default: () => ({}),
     },
-    branchQaSelector: {
-      default: '',
-    },
   },
   props: {
     currentBranch: {
@@ -119,7 +116,6 @@ export default {
           :input-name="inputs.branch.name"
           :default="currentBranch"
           :toggle-class="toggleClass.branch"
-          :qa-selector="branchQaSelector"
           data-testid="compare-dropdown"
           @selected="selectBranch"
         />
diff --git a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
index 6f46b41ee5b..2855d704507 100644
--- a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
@@ -46,11 +46,6 @@ export default {
       required: false,
       default: '',
     },
-    qaSelector: {
-      type: String,
-      required: false,
-      default: null,
-    },
   },
   data() {
     return {
@@ -142,7 +137,7 @@ export default {
         'gl-align-items-flex-start! gl-justify-content-start! mr-compare-dropdown',
         toggleClass,
       ]"
-      :data-qa-selector="qaSelector"
+      data-testid="source-branch-dropdown"
       @shown="fetchData"
       @search="searchData"
       @select="selectItem"