Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 3 deletions

diff --git a/app/assets/javascripts/pages/projects/issues/service_desk/index.js b/app/assets/javascripts/pages/projects/issues/service_desk/index.js
index 56054f5fc80..9304d9b6832 100644
--- a/app/assets/javascripts/pages/projects/issues/service_desk/index.js
+++ b/app/assets/javascripts/pages/projects/issues/service_desk/index.js
@@ -1,11 +1,17 @@
 import FilteredSearchServiceDesk from './filtered_search';
+import initIssuablesList from '~/issuables_list';
 
 document.addEventListener('DOMContentLoaded', () => {
   const supportBotData = JSON.parse(
     document.querySelector('.js-service-desk-issues').dataset.supportBot,
   );
 
-  const filteredSearchManager = new FilteredSearchServiceDesk(supportBotData);
+  if (document.querySelector('.filtered-search')) {
+    const filteredSearchManager = new FilteredSearchServiceDesk(supportBotData);
+    filteredSearchManager.setup();
+  }
 
-  filteredSearchManager.setup();
+  if (gon.features?.vueIssuablesList) {
+    initIssuablesList();
+  }
 });
diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
index 385da528d89..97ca92420bd 100644
--- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
+++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
@@ -1,11 +1,11 @@
 <script>
+import { GlSprintf } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
 import { s__, sprintf } from '~/locale';
 import { visitUrl } from '~/lib/utils/url_utility';
 import eventHub from '../event_hub';
-import { GlSprintf } from '@gitlab/ui';
 
 export default {
   components: {