Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 15 deletions

diff --git a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
index d70cf26ec6e..1c0239c2153 100644
--- a/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
+++ b/app/assets/javascripts/merge_requests/components/compare_dropdown.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlListbox, GlButton, GlIcon } from '@gitlab/ui';
+import { GlListbox } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import { createAlert } from '~/flash';
 import { __ } from '~/locale';
@@ -8,8 +8,6 @@ import axios from '~/lib/utils/axios_utils';
 export default {
   components: {
     GlListbox,
-    GlButton,
-    GlIcon,
   },
   props: {
     staticData: {
@@ -141,17 +139,6 @@ export default {
       @shown="fetchData"
       @search="searchData"
       @select="selectItem"
-    >
-      <template #toggle>
-        <gl-button
-          class="gl-w-full gl-align-items-flex-start! gl-justify-content-start! mr-compare-dropdown"
-          :class="toggleClass"
-          :data-qa-selector="qaSelector"
-        >
-          {{ current.text || dropdownHeader }}
-          <gl-icon name="chevron-down" class="gl-new-dropdown-chevron gl-float-right" />
-        </gl-button>
-      </template>
-    </gl-listbox>
+    />
   </div>
 </template>