diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 21:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 21:09:48 +0300 |
| commit | a8caa9ce4922947ba057f259bccd017c2177e1b5 (patch) | |
| tree | c2d3e86b3c0336630edc7604ea575ca605fd1dd0 /app/assets/javascripts/milestones | |
| parent | a483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/milestones')
| -rw-r--r-- | app/assets/javascripts/milestones/project_milestone_combobox.vue | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/javascripts/milestones/project_milestone_combobox.vue b/app/assets/javascripts/milestones/project_milestone_combobox.vue index 43ab30b0465..d06e79d259b 100644 --- a/app/assets/javascripts/milestones/project_milestone_combobox.vue +++ b/app/assets/javascripts/milestones/project_milestone_combobox.vue @@ -1,9 +1,9 @@ <script> import { GlDropdown, - GlNewDropdownDivider, + GlDropdownDivider, GlNewDropdownHeader, - GlNewDropdownItem, + GlDropdownItem, GlLoadingIcon, GlSearchBoxByType, GlIcon, @@ -18,9 +18,9 @@ const SEARCH_DEBOUNCE_MS = 250; export default { components: { GlDropdown, - GlNewDropdownDivider, + GlDropdownDivider, GlNewDropdownHeader, - GlNewDropdownItem, + GlDropdownItem, GlLoadingIcon, GlSearchBoxByType, GlIcon, @@ -200,7 +200,7 @@ export default { <span class="text-center d-block">{{ $options.translations.selectMilestone }}</span> </gl-new-dropdown-header> - <gl-new-dropdown-divider /> + <gl-dropdown-divider /> <gl-search-box-by-type ref="searchBox" @@ -211,26 +211,26 @@ export default { @keydown.enter.prevent="onSearchBoxEnter" /> - <gl-new-dropdown-item @click="onMilestoneClicked(null)"> + <gl-dropdown-item @click="onMilestoneClicked(null)"> <span :class="{ 'pl-4': true, 'selected-item': selectedMilestones.length === 0 }"> {{ $options.translations.noMilestone }} </span> - </gl-new-dropdown-item> + </gl-dropdown-item> - <gl-new-dropdown-divider /> + <gl-dropdown-divider /> <template v-if="isLoading"> <gl-loading-icon /> - <gl-new-dropdown-divider /> + <gl-dropdown-divider /> </template> <template v-else-if="noResults"> <div class="dropdown-item-space"> <span ref="noResults" class="pl-4">{{ $options.translations.noResultsLabel }}</span> </div> - <gl-new-dropdown-divider /> + <gl-dropdown-divider /> </template> <template v-else-if="dropdownItems.length"> - <gl-new-dropdown-item + <gl-dropdown-item v-for="item in dropdownItems" :key="item" role="milestone option" @@ -239,12 +239,12 @@ export default { <span :class="{ 'pl-4': true, 'selected-item': isSelectedMilestone(item) }"> {{ item }} </span> - </gl-new-dropdown-item> - <gl-new-dropdown-divider /> + </gl-dropdown-item> + <gl-dropdown-divider /> </template> - <gl-new-dropdown-item v-for="(item, idx) in extraLinks" :key="idx" :href="item.url"> + <gl-dropdown-item v-for="(item, idx) in extraLinks" :key="idx" :href="item.url"> <span class="pl-4">{{ item.text }}</span> - </gl-new-dropdown-item> + </gl-dropdown-item> </gl-dropdown> </template> |