Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 6 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 1b6e365fdb2..af4a26a7352 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_form.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue
@@ -12,7 +12,7 @@ import {
   GlLoadingIcon,
   GlSearchBoxByType,
   GlSprintf,
-  GlTable,
+  GlTableLite,
 } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -45,7 +45,7 @@ export default {
     GlLoadingIcon,
     GlSearchBoxByType,
     GlSprintf,
-    GlTable,
+    GlTableLite,
   },
   currentUsername: gon.current_username,
   dropdownLabel,
@@ -295,7 +295,7 @@ export default {
 
       <p>{{ $options.userMappingMessage }}</p>
 
-      <gl-table :fields="$options.tableConfig" :items="userMappings" fixed>
+      <gl-table-lite :fields="$options.tableConfig" :items="userMappings" fixed>
         <template #cell(arrow)>
           <gl-icon name="arrow-right" :aria-label="__('Will be mapped to')" />
         </template>
@@ -326,9 +326,9 @@ export default {
             </gl-dropdown-text>
           </gl-dropdown>
         </template>
-      </gl-table>
+      </gl-table-lite>
 
-      <gl-loading-icon v-if="isInitialLoadingState" size="sm" />
+      <gl-loading-icon v-if="isInitialLoadingState" size="md" />
 
       <gl-button
         v-if="hasMoreUsers"
@@ -343,7 +343,7 @@ export default {
         <gl-button
           type="submit"
           category="primary"
-          variant="success"
+          variant="confirm"
           class="js-no-auto-disable"
           :loading="isSubmitting"
           data-qa-selector="jira_issues_import_button"
diff --git a/app/assets/javascripts/jira_import/index.js b/app/assets/javascripts/jira_import/index.js
index 695a237bf50..c1701cd94c2 100644
--- a/app/assets/javascripts/jira_import/index.js
+++ b/app/assets/javascripts/jira_import/index.js
@@ -20,6 +20,7 @@ export default function mountJiraImportApp() {
 
   return new Vue({
     el,
+    name: 'JiraImportRoot',
     apolloProvider,
     render(createComponent) {
       return createComponent(App, {