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/jira_import | |
parent | a483e9271bccdd2cb98cb4f3874fff5d3264d07d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_import')
-rw-r--r-- | app/assets/javascripts/jira_import/components/jira_import_form.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue index c88996d6ea1..4339021d9a0 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_form.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue @@ -3,7 +3,7 @@ import { GlAlert, GlButton, GlDropdown, - GlNewDropdownItem, + GlDropdownItem, GlDropdownText, GlFormGroup, GlFormSelect, @@ -35,7 +35,7 @@ export default { GlAlert, GlButton, GlDropdown, - GlNewDropdownItem, + GlDropdownItem, GlDropdownText, GlFormGroup, GlFormSelect, @@ -305,14 +305,14 @@ export default { <gl-loading-icon v-if="isFetching" /> - <gl-new-dropdown-item + <gl-dropdown-item v-for="user in users" v-else :key="user.id" @click="updateMapping(data.item.jiraAccountId, user.id, user.username)" > {{ user.username }} ({{ user.name }}) - </gl-new-dropdown-item> + </gl-dropdown-item> <gl-dropdown-text v-show="shouldShowNoMatchesFoundText" class="text-secondary"> {{ __('No matches found') }} |