Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 49 insertions, 46 deletions

diff --git a/app/views/import/gitlab/status.html.haml b/app/views/import/gitlab/status.html.haml
index a5fa12fe7df..a12b69ae5f9 100644
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
@@ -4,52 +4,55 @@
   %i.fa.fa-heart
   = _('Import projects from GitLab.com')
 
-%p.light
-  = _('Select projects you want to import.')
-%hr
-%p
-  = button_tag class: "btn btn-import btn-success js-import-all" do
-    = _('Import all projects')
-    = icon("spinner spin", class: "loading-icon")
+- if Feature.enabled?(:new_import_ui)
+  = render 'import/githubish_status', provider: 'gitlab', filterable: false
+- else
+  %p.light
+    = _('Select projects you want to import.')
+  %hr
+  %p
+    = button_tag class: "btn btn-import btn-success js-import-all" do
+      = _('Import all projects')
+      = icon("spinner spin", class: "loading-icon")
 
-.table-responsive
-  %table.table.import-jobs
-    %colgroup.import-jobs-from-col
-    %colgroup.import-jobs-to-col
-    %colgroup.import-jobs-status-col
-    %thead
-      %tr
-        %th= _('From GitLab.com')
-        %th= _('To this GitLab instance')
-        %th= _('Status')
-    %tbody
-      - @already_added_projects.each do |project|
-        %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
-          %td
-            = link_to project.import_source, "https://gitlab.com/#{project.import_source}", target: "_blank"
-          %td
-            = link_to project.full_path, [project.namespace.becomes(Namespace), project]
-          %td.job-status
-            - case project.import_status
-            - when 'finished'
-              %span
-                %i.fa.fa-check
-                = _('done')
-            - when 'started'
-              %i.fa.fa-spinner.fa-spin
-              = _('started')
-            - else
-              = project.human_import_status_name
+  .table-responsive
+    %table.table.import-jobs
+      %colgroup.import-jobs-from-col
+      %colgroup.import-jobs-to-col
+      %colgroup.import-jobs-status-col
+      %thead
+        %tr
+          %th= _('From GitLab.com')
+          %th= _('To this GitLab instance')
+          %th= _('Status')
+      %tbody
+        - @already_added_projects.each do |project|
+          %tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
+            %td
+              = link_to project.import_source, "https://gitlab.com/#{project.import_source}", target: "_blank"
+            %td
+              = link_to project.full_path, [project.namespace.becomes(Namespace), project]
+            %td.job-status
+              - case project.import_status
+              - when 'finished'
+                %span
+                  %i.fa.fa-check
+                  = _('done')
+              - when 'started'
+                %i.fa.fa-spinner.fa-spin
+                = _('started')
+              - else
+                = project.human_import_status_name
 
-      - @repos.each do |repo|
-        %tr{ id: "repo_#{repo["id"]}" }
-          %td
-            = link_to repo["path_with_namespace"], "https://gitlab.com/#{repo["path_with_namespace"]}", target: "_blank", rel: 'noopener noreferrer'
-          %td.import-target
-            = import_project_target(repo['namespace']['path'], repo['name'])
-          %td.import-actions.job-status
-            = button_tag class: "btn btn-import js-add-to-import" do
-              = _('Import')
-              = icon("spinner spin", class: "loading-icon")
+        - @repos.each do |repo|
+          %tr{ id: "repo_#{repo["id"]}" }
+            %td
+              = link_to repo["path_with_namespace"], "https://gitlab.com/#{repo["path_with_namespace"]}", target: "_blank", rel: 'noopener noreferrer'
+            %td.import-target
+              = import_project_target(repo['namespace']['path'], repo['name'])
+            %td.import-actions.job-status
+              = button_tag class: "btn btn-import js-add-to-import" do
+                = _('Import')
+                = icon("spinner spin", class: "loading-icon")
 
-.js-importer-status{ data: { jobs_import_path: "#{jobs_import_gitlab_path}", import_path: "#{import_gitlab_path}" } }
+  .js-importer-status{ data: { jobs_import_path: "#{jobs_import_gitlab_path}", import_path: "#{import_gitlab_path}" } }