diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 21:10:19 +0300 |
| commit | 9b14160725d91f8824b35223f16bf073a97bf7de (patch) | |
| tree | 121f5165f80d2c921b4135566b3c9e620531434d /app/assets/javascripts/sidebar | |
| parent | 27622f7417713cbd2057a7f642e9ce128d9fc169 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/lib/sidebar_move_issue.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue index 14c14d0bad1..2f714ac3847 100644 --- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue @@ -62,7 +62,7 @@ export default { this.addAssignee = this.store.addAssignee.bind(this.store); this.removeAllAssignees = this.store.removeAllAssignees.bind(this.store); - // Get events from glDropdown + // Get events from deprecatedJQueryDropdown eventHub.$on('sidebar.removeAssignee', this.removeAssignee); eventHub.$on('sidebar.addAssignee', this.addAssignee); eventHub.$on('sidebar.removeAllAssignees', this.removeAllAssignees); diff --git a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js index 0fb9cf22653..edeb1bba020 100644 --- a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js +++ b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import '~/gl_dropdown'; import { escape } from 'lodash'; import { __ } from '~/locale'; +import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; function isValidProjectId(id) { return id > 0; @@ -27,7 +27,7 @@ class SidebarMoveIssue { } initDropdown() { - this.$dropdownToggle.glDropdown({ + initDeprecatedJQueryDropdown(this.$dropdownToggle, { search: { fields: ['name_with_namespace'], }, |