Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/target_project_dropdown.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/target_project_dropdown.js
index b72fe6681df..e9f0e008435 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/target_project_dropdown.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/target_project_dropdown.js
@@ -1,8 +1,9 @@
 import $ from 'jquery';
+import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 
 export default () => {
   const $targetProjectDropdown = $('.js-target-project');
-  $targetProjectDropdown.glDropdown({
+  initDeprecatedJQueryDropdown($targetProjectDropdown, {
     selectable: true,
     fieldName: $targetProjectDropdown.data('fieldName'),
     filterable: true,
@@ -16,7 +17,7 @@ export default () => {
       $('.mr_target_commit').empty();
       const $targetBranchDropdown = $('.js-target-branch');
       $targetBranchDropdown.data('refsUrl', $el.data('refsUrl'));
-      $targetBranchDropdown.data('glDropdown').clearMenu();
+      $targetBranchDropdown.data('deprecatedJQueryDropdown').clearMenu();
     },
   });
 };
diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
index 25abb80cfae..11af50169f5 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
@@ -6,6 +6,7 @@ import howToMerge from '~/how_to_merge';
 import initPipelines from '~/commit/pipelines/pipelines_bundle';
 import initVueIssuableSidebarApp from '~/issuable_sidebar/sidebar_bundle';
 import initSourcegraph from '~/sourcegraph';
+import loadAwardsHandler from '~/awards_handler';
 
 export default function() {
   new ZenMode(); // eslint-disable-line no-new
@@ -19,4 +20,5 @@ export default function() {
   handleLocationHash();
   howToMerge();
   initSourcegraph();
+  loadAwardsHandler();
 }