Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 13 insertions, 7 deletions

diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml
index 096d2543502..a35e9ea3fcf 100644
--- a/app/views/import/manifest/_form.html.haml
+++ b/app/views/import/manifest/_form.html.haml
@@ -2,11 +2,14 @@
   .form-group
     = label_tag :group_id, nil, class: 'label-bold' do
       = _('Group')
-    .input-group
-      .input-group-prepend.has-tooltip{ title: root_url }
-        .input-group-text
-          = root_url
-      = select_tag :group_id, namespaces_options(params[:namespace_id], display_path: true, groups_only: true), { class: 'select2 js-select-namespace' }
+    .input-group.gl-max-w-62
+      - namespace_id = namespace_id_from(params) || current_user.manageable_groups(include_groups_with_developer_maintainer_access: true)&.first&.id
+      - namespace_full_path = GroupFinder.new(current_user).execute(id: namespace_id)&.full_path
+      .js-vue-new-project-url-select{ data: { namespace_full_path: namespace_full_path,
+        namespace_id: namespace_id ,
+        input_id: 'group_id',
+        input_name: 'group_id',
+        root_url: root_url } }
     .form-text.text-muted
       = _('Choose the top-level group for your repository imports.')
 
@@ -19,5 +22,8 @@
       = link_to sprite_icon('question-o'), help_page_path('user/project/import/manifest')
 
   .gl-mb-3
-    = submit_tag _('List available repositories'), class: 'gl-button btn btn-confirm'
-    = link_to _('Cancel'), new_project_path, class: 'gl-button btn btn-default btn-cancel'
+    = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do
+      = _('List available repositories')
+
+    = render Pajamas::ButtonComponent.new(href: new_project_path) do
+      = _('Cancel')