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

3 files changed, 56 insertions, 50 deletions

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 61dc9f13d50..bd385db9692 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/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;
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 0934c47a8e2..0a835dcdeb0 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -48,52 +48,54 @@
         .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
-                  = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
-                    Import project from
-                  .col-sm-12.import-buttons
-                    %div
-                      - if github_import_enabled?
-                        = link_to new_import_github_path, class: 'btn import_github' do
-                          = icon('github', text: 'GitHub')
-                    %div
-                      - if bitbucket_import_enabled?
-                        = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do
-                          = icon('bitbucket', text: 'Bitbucket')
-                        - unless bitbucket_import_configured?
-                          = render 'bitbucket_import_modal'
-                    %div
-                      - if gitlab_import_enabled?
-                        = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do
-                          = icon('gitlab', text: 'GitLab.com')
-                        - unless gitlab_import_configured?
-                          = render 'gitlab_import_modal'
-                    %div
-                      - if google_code_import_enabled?
-                        = link_to new_import_google_code_path, class: 'btn import_google_code' do
-                          = icon('google', text: 'Google Code')
-                    %div
-                      - if fogbugz_import_enabled?
-                        = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
-                          = icon('bug', text: 'Fogbugz')
-                    %div
-                      - if gitea_import_enabled?
-                        = link_to new_import_gitea_url, class: 'btn import_gitea' do
-                          = custom_icon('go_logo')
-                          Gitea
-                    %div
-                      - if git_import_enabled?
-                        %button.btn.js-toggle-button.import_git{ type: "button" }
-                          = icon('git', text: 'Repo by URL')
-                    - if gitlab_project_import_enabled?
-                      .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
-                        = 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
-                      %hr
-                        = render "shared/import_form", f: f
+              .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
+                    .import-buttons
+                      %div
+                        - if github_import_enabled?
+                          = link_to new_import_github_path, class: 'btn import_github' do
+                            = icon('github', text: 'GitHub')
+                      %div
+                        - if bitbucket_import_enabled?
+                          = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do
+                            = icon('bitbucket', text: 'Bitbucket')
+                          - unless bitbucket_import_configured?
+                            = render 'bitbucket_import_modal'
+                      %div
+                        - if gitlab_import_enabled?
+                          = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do
+                            = icon('gitlab', text: 'GitLab.com')
+                          - unless gitlab_import_configured?
+                            = render 'gitlab_import_modal'
+                      %div
+                        - if google_code_import_enabled?
+                          = link_to new_import_google_code_path, class: 'btn import_google_code' do
+                            = icon('google', text: 'Google Code')
+                      %div
+                        - if fogbugz_import_enabled?
+                          = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
+                            = icon('bug', text: 'Fogbugz')
+                      %div
+                        - if gitea_import_enabled?
+                          = link_to new_import_gitea_url, class: 'btn import_gitea' do
+                            = custom_icon('go_logo')
+                            Gitea
+                      %div
+                        - if git_import_enabled?
+                          %button.btn.js-toggle-button.import_git{ type: "button" }
+                            = icon('git', text: 'Repo by URL')
+                      - if gitlab_project_import_enabled?
+                        .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
+                          = 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.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
diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb
index 0b43377a579..ae136202f0c 100644
--- a/lib/gitlab/project_template.rb
+++ b/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