Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
index def2f091947..202286a5fb4 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
@@ -1,4 +1,5 @@
 import { __ } from '~/locale';
+import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 
 export default class ProtectedTagAccessDropdown {
   constructor(options) {
@@ -8,7 +9,7 @@ export default class ProtectedTagAccessDropdown {
 
   initDropdown() {
     const { onSelect } = this.options;
-    this.options.$dropdown.glDropdown({
+    initDeprecatedJQueryDropdown(this.options.$dropdown, {
       data: this.options.data,
       selectable: true,
       inputId: this.options.$dropdown.data('inputId'),
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 03a5fe6b353..eb44f0c67fd 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -23,7 +23,7 @@ export default class ProtectedTagCreate {
     });
 
     // Select default
-    $allowedToCreateDropdown.data('glDropdown').selectRowAtIndex(0);
+    $allowedToCreateDropdown.data('deprecatedJQueryDropdown').selectRowAtIndex(0);
 
     // Protected tag dropdown
     this.createItemDropdown = new CreateItemDropdown({