diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/milestones/components/milestone_combobox.vue | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/milestones/components/milestone_combobox.vue')
| -rw-r--r-- | app/assets/javascripts/milestones/components/milestone_combobox.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/milestones/components/milestone_combobox.vue b/app/assets/javascripts/milestones/components/milestone_combobox.vue index 1db2d10db20..e8499015210 100644 --- a/app/assets/javascripts/milestones/components/milestone_combobox.vue +++ b/app/assets/javascripts/milestones/components/milestone_combobox.vue @@ -171,7 +171,7 @@ export default { <template> <gl-dropdown v-bind="$attrs" class="milestone-combobox" @shown="focusSearchBox"> - <template slot="button-content"> + <template #button-content> <span data-testid="milestone-combobox-button-content" class="gl-flex-grow-1 text-muted">{{ selectedMilestonesLabel }}</span> @@ -202,7 +202,7 @@ export default { <gl-dropdown-divider /> <template v-if="isLoading"> - <gl-loading-icon /> + <gl-loading-icon size="sm" /> <gl-dropdown-divider /> </template> <template v-else-if="showNoResults"> |