diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 00:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 00:09:49 +0300 |
| commit | 9877050db1dd1693c672a6b29a356c5b2a7edce0 (patch) | |
| tree | 07e8b3837333294337121b96f296eb5622a8a7e9 /app/assets/javascripts/vue_shared/components/color_select_dropdown | |
| parent | 370736438075748c36abd7fd7dd32a8ef98048f9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/color_select_dropdown')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_contents.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_contents.vue b/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_contents.vue index 315ae126e3e..84da6e1437e 100644 --- a/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_contents.vue +++ b/app/assets/javascripts/vue_shared/components/color_select_dropdown/dropdown_contents.vue @@ -44,7 +44,7 @@ export default { }, computed: { buttonText() { - if (!this.hasSelectedColor()) { + if (!this.hasSelectedColor) { return this.dropdownButtonText; } @@ -103,7 +103,7 @@ export default { :color="localSelectedColor.color" :title="localSelectedColor.title" /> - <span v-else>{{ buttonText }}</span> + <span v-else data-testid="fallback-button-text">{{ buttonText }}</span> </template> <template #header> <dropdown-header |