Merge branch '39028-repo-by-url-fields' into 'master'

Add project fields to import project by url

Closes #39028

See merge request gitlab-org/gitlab-ce!14822

app/assets/stylesheets/pages/projects.scss

@@ -634,10 +634,14 @@ a.deploy-project-label {
 }
 
 .project-import {
-  .form-group {
+  .import-btn-container {
     margin-bottom: 0;
   }
 
+  .toggle-import-form {
+    padding-bottom: 10px;
+  }
+
   .import-buttons {
     padding-left: 0;
     display: -webkit-flex;

app/views/projects/new.html.haml

@@ -48,11 +48,12 @@
         .tab-pane.import-project-pane{ id: 'import-project-pane', role: 'tabpanel' }
           = form_for @project, html: { class: 'new_project' } do |f|
             - if import_sources_enabled?
-              .project-import
-                .form-group.clearfix
+              .project-import.row
+                .col-sm-12
+                  .form-group.import-btn-container.clearfix
                     = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
                       Import project from
-                  .col-sm-12.import-buttons
+                    .import-buttons
                       %div
                         - if github_import_enabled?
                           = link_to new_import_github_path, class: 'btn import_github' do
@@ -91,9 +92,10 @@
                           = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
                             = icon('gitlab', text: 'GitLab export')
                 .col-lg-12
-                    .js-toggle-content.hide
+                  .js-toggle-content.hide.toggle-import-form
                     %hr
                       = render "shared/import_form", f: f
+                      = render 'new_project_fields', f: f, project_name_id: "import-url-name"
 
 .save-project-loader.hide
   .center

lib/gitlab/project_template.rb

@@ -25,9 +25,9 @@ module Gitlab
     end
 
     TEMPLATES_TABLE = [
-      ProjectTemplate.new('rails', 'Ruby on Rails', 'Includes a MVC structure, gemfile, rakefile, and .gitlab-ci.yml file, along with many others, to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/rails'),
-      ProjectTemplate.new('spring', 'Spring', 'Includes a MVC structure, mvnw, pom.xml, and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/spring'),
-      ProjectTemplate.new('express', 'NodeJS Express', 'Includes a MVC structure, and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/express')
+      ProjectTemplate.new('rails', 'Ruby on Rails', 'Includes an MVC structure, gemfile, rakefile, and .gitlab-ci.yml file, along with many others, to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/rails'),
+      ProjectTemplate.new('spring', 'Spring', 'Includes an MVC structure, mvnw, pom.xml, and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/spring'),
+      ProjectTemplate.new('express', 'NodeJS Express', 'Includes an MVC structure and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/express')
     ].freeze
 
     class << self