Merge branch 'master' into sh-support-bitbucket-server-import

1 files changed, 32 insertions, 19 deletions

diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml
index ccb724a3b0f..246e09d7677 100644
--- a/app/views/projects/_import_project_pane.html.haml
+++ b/app/views/projects/_import_project_pane.html.haml
@@ -1,54 +1,67 @@
 - active_tab = local_assigns.fetch(:active_tab, 'blank')
-- f = local_assigns.fetch(:f)
 
 .project-import
   .form-group.import-btn-container.clearfix
-    = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
+    %h5
       Import project from
     .import-buttons
       - 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')
-      %div
-        - if github_import_enabled?
+
+      - if github_import_enabled?
+        %div
           = link_to new_import_github_path, class: 'btn js-import-github' do
             = icon('github', text: 'GitHub')
-      %div
-        - if bitbucket_import_enabled?
+
+      - if bitbucket_import_enabled?
+        %div
           = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do
             = icon('bitbucket', text: 'Bitbucket Cloud')
           - unless bitbucket_import_configured?
             = render 'bitbucket_import_modal'
-      %div
-        - if bitbucket_server_import_enabled?
+      - if bitbucket_server_import_enabled?
+        %div
           = link_to status_import_bitbucket_server_path, class: "btn import_bitbucket" do
             = icon('bitbucket', text: 'Bitbucket Server')
             = render 'bitbucket_import_modal'
-      %div
-        - if gitlab_import_enabled?
+        %div
+      - if gitlab_import_enabled?
+        %div
           = 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?
+
+      - if google_code_import_enabled?
+        %div
           = link_to new_import_google_code_path, class: 'btn import_google_code' do
             = icon('google', text: 'Google Code')
-      %div
-        - if fogbugz_import_enabled?
+
+      - if fogbugz_import_enabled?
+        %div
           = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
             = icon('bug', text: 'Fogbugz')
-      %div
-        - if gitea_import_enabled?
+
+      - if gitea_import_enabled?
+        %div
           = link_to new_import_gitea_path, class: 'btn import_gitea' do
             = custom_icon('go_logo')
             Gitea
-      %div
-        - if git_import_enabled?
+
+      - if git_import_enabled?
+        %div
           %button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } }
             = icon('git', text: 'Repo by URL')
+
+      - if manifest_import_enabled?
+        %div
+          = link_to new_import_manifest_path, class: 'btn import_manifest' do
+            = icon('file-text-o', text: 'Manifest file')
+
   .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') }
-    %hr
+    = form_for @project, html: { class: 'new_project' } do |f|
+      %hr
       = render "shared/import_form", f: f
       = render 'new_project_fields', f: f, project_name_id: "import-url-name"