diff options
Diffstat (limited to 'app/views/import/manifest')
-rw-r--r-- | app/views/import/manifest/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/manifest/status.html.haml | 37 |
2 files changed, 2 insertions, 37 deletions
diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml index b515ce084e4..3a5b5924c6a 100644 --- a/app/views/import/manifest/_form.html.haml +++ b/app/views/import/manifest/_form.html.haml @@ -18,6 +18,6 @@ = _('Import multiple repositories by uploading a manifest file.') = link_to icon('question-circle'), help_page_path('user/project/import/manifest') - .append-bottom-10 + .gl-mb-3 = submit_tag _('List available repositories'), class: 'btn btn-success' = link_to _('Cancel'), new_project_path, class: 'btn btn-cancel' diff --git a/app/views/import/manifest/status.html.haml b/app/views/import/manifest/status.html.haml index e85162ad1b4..c3e77554b09 100644 --- a/app/views/import/manifest/status.html.haml +++ b/app/views/import/manifest/status.html.haml @@ -1,42 +1,7 @@ - page_title _("Manifest import") - header_title _("Projects"), root_path -- provider = 'manifest' %h3.page-title = _('Manifest file import') -%p - = button_tag class: "btn btn-import btn-success js-import-all" do - = _('Import all repositories') - = icon("spinner spin", class: "loading-icon") - -.table-responsive - %table.table.import-jobs - %thead - %tr - %th= _('Repository URL') - %th= _('To GitLab') - %th= _('Status') - %tbody - - @already_added_projects.each do |project| - %tr{ id: "project_#{project.id}", class: project_status_css_class(project.import_status) } - %td - = project.import_url - %td - = link_to_project project - %td.job-status - = render 'import/project_status', project: project - - - @pending_repositories.each do |repository| - %tr{ id: "repo_#{repository[:id]}" } - %td - = repository[:url] - %td.import-target - = import_project_target(@group.full_path, repository[:path]) - %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: url_for([:jobs, :import, provider]), - import_path: url_for([:import, provider]) } } += render 'import/githubish_status', provider: 'manifest' |