diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/jira_import/components | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
| download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/jira_import/components')
| -rw-r--r-- | app/assets/javascripts/jira_import/components/jira_import_form.vue | 26 |
1 files changed, 13 insertions, 13 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 5bf98682f92..4339021d9a0 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_form.vue +++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue @@ -2,9 +2,9 @@ import { GlAlert, GlButton, - GlNewDropdown, - GlNewDropdownItem, - GlNewDropdownText, + GlDropdown, + GlDropdownItem, + GlDropdownText, GlFormGroup, GlFormSelect, GlIcon, @@ -34,9 +34,9 @@ export default { components: { GlAlert, GlButton, - GlNewDropdown, - GlNewDropdownItem, - GlNewDropdownText, + GlDropdown, + GlDropdownItem, + GlDropdownText, GlFormGroup, GlFormSelect, GlIcon, @@ -293,7 +293,7 @@ export default { <gl-icon name="arrow-right" :aria-label="__('Will be mapped to')" /> </template> <template #cell(gitlabUsername)="data"> - <gl-new-dropdown + <gl-dropdown :text="data.value || $options.currentUsername" class="w-100" :aria-label=" @@ -301,23 +301,23 @@ export default { " @hide="resetDropdown" > - <gl-search-box-by-type v-model.trim="searchTerm" class="m-2" /> + <gl-search-box-by-type v-model.trim="searchTerm" class="gl-m-3" /> <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-new-dropdown-text v-show="shouldShowNoMatchesFoundText" class="text-secondary"> + <gl-dropdown-text v-show="shouldShowNoMatchesFoundText" class="text-secondary"> {{ __('No matches found') }} - </gl-new-dropdown-text> - </gl-new-dropdown> + </gl-dropdown-text> + </gl-dropdown> </template> </gl-table> |