diff options
Diffstat (limited to 'app/views/import')
-rw-r--r-- | app/views/import/_githubish_status.html.haml | 4 | ||||
-rw-r--r-- | app/views/import/fogbugz/new_user_map.html.haml | 30 | ||||
-rw-r--r-- | app/views/import/github/status.html.haml | 5 |
3 files changed, 21 insertions, 18 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index 35fd5d6eda6..9ea52a8f82f 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -5,6 +5,7 @@ - paginatable = local_assigns.fetch(:paginatable, false) - default_namespace_path = (local_assigns[:default_namespace] || current_user.namespace).full_path - provider_title = Gitlab::ImportSources.title(provider) +- optional_stages = local_assigns.fetch(:optional_stages, []) - header_title _("New project"), new_project_path - add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') @@ -18,4 +19,5 @@ default_target_namespace: default_namespace_path, import_path: url_for([:import, provider, { format: :json }]), filterable: filterable.to_s, - paginatable: paginatable.to_s }.merge(extra_data) } + paginatable: paginatable.to_s, + optional_stages: optional_stages.to_json }.merge(extra_data) } diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml index 28836055e0e..9d4c0f62134 100644 --- a/app/views/import/fogbugz/new_user_map.html.haml +++ b/app/views/import/fogbugz/new_user_map.html.haml @@ -23,23 +23,21 @@ %p = html_escape(_('Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. "By %{link_open}@johnsmith%{link_close}"). It will also associate and/or assign these issues and comments with the selected user.')) % { link_open: '<a href="#">'.html_safe, link_close: '</a>'.html_safe } - .table-holder - %table.table - %thead + %table.table + %thead + %tr + %th= _("ID") + %th= _("Name") + %th= _("Email") + %th= _("GitLab User") + %tbody + - @user_map.each do |id, user| %tr - %th= _("ID") - %th= _("Name") - %th= _("Email") - %th= _("GitLab User") - %tbody - - @user_map.each do |id, user| - %tr - %td= id - %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control' - %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control' - %td - = users_select_tag("users[#{id}][gitlab_user]", class: 'custom-form-control', - scope: :all, email_user: true, selected: user[:gitlab_user]) + %td= id + %td= text_field_tag "users[#{id}][name]", user[:name], class: 'form-control gl-form-input' + %td= text_field_tag "users[#{id}][email]", user[:email], class: 'form-control gl-form-input' + %td + .js-gitlab-user{ data: { name: "users[#{id}][gitlab_user]" } } .form-actions = submit_tag _('Continue to the next step'), class: 'gl-button btn btn-confirm' diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 1b556cd0f7f..25afe9a7b1b 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -7,4 +7,7 @@ - paginatable = Feature.enabled?(:remove_legacy_github_client) -= render 'import/githubish_status', provider: 'github', paginatable: paginatable, default_namespace: @namespace += render 'import/githubish_status', + provider: 'github', paginatable: paginatable, + default_namespace: @namespace, + optional_stages: Gitlab::GithubImport::Settings.stages_array |