diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/milestones | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/milestones')
-rw-r--r-- | app/assets/javascripts/milestones/components/milestone_combobox.vue | 13 | ||||
-rw-r--r-- | app/assets/javascripts/milestones/components/milestone_results_section.vue | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/app/assets/javascripts/milestones/components/milestone_combobox.vue b/app/assets/javascripts/milestones/components/milestone_combobox.vue index a840e696386..d7ffdfd7c5f 100644 --- a/app/assets/javascripts/milestones/components/milestone_combobox.vue +++ b/app/assets/javascripts/milestones/components/milestone_combobox.vue @@ -192,10 +192,12 @@ export default { @keydown.enter.prevent="onSearchBoxEnter" /> - <gl-dropdown-item @click="selectNoMilestone()"> - <span :class="{ 'gl-pl-6': true, 'selected-item': selectedMilestones.length === 0 }"> - {{ $options.translations.noMilestone }} - </span> + <gl-dropdown-item + :is-checked="selectedMilestones.length === 0" + is-check-item + @click="selectNoMilestone()" + > + {{ $options.translations.noMilestone }} </gl-dropdown-item> <gl-dropdown-divider /> @@ -241,9 +243,10 @@ export default { v-for="(item, idx) in extraLinks" :key="idx" :href="item.url" + :is-check-item="true" data-testid="milestone-combobox-extra-links" > - <span class="gl-pl-6">{{ item.text }}</span> + {{ item.text }} </gl-dropdown-item> </gl-dropdown> </template> diff --git a/app/assets/javascripts/milestones/components/milestone_results_section.vue b/app/assets/javascripts/milestones/components/milestone_results_section.vue index b866977b974..e3c691b14c7 100644 --- a/app/assets/javascripts/milestones/components/milestone_results_section.vue +++ b/app/assets/javascripts/milestones/components/milestone_results_section.vue @@ -77,10 +77,14 @@ export default { </div> </template> <template v-else> - <gl-dropdown-item v-for="{ title } in items" :key="title" @click="$emit('selected', title)"> - <span class="gl-pl-6" :class="{ 'selected-item': isSelectedMilestone(title) }"> - {{ title }} - </span> + <gl-dropdown-item + v-for="{ title } in items" + :key="title" + :is-checked="isSelectedMilestone(title)" + is-check-item + @click="$emit('selected', title)" + > + {{ title }} </gl-dropdown-item> <gl-dropdown-divider /> </template> |