Commit f97e83dd authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Add project fields to import project by url

parent 119a3b34
...@@ -634,10 +634,14 @@ a.deploy-project-label { ...@@ -634,10 +634,14 @@ a.deploy-project-label {
} }
.project-import { .project-import {
.form-group { .import-btn-container {
margin-bottom: 0; margin-bottom: 0;
} }
.toggle-import-form {
padding-bottom: 10px;
}
.import-buttons { .import-buttons {
padding-left: 0; padding-left: 0;
display: -webkit-flex; display: -webkit-flex;
......
...@@ -48,11 +48,12 @@ ...@@ -48,11 +48,12 @@
.tab-pane.import-project-pane{ id: 'import-project-pane', role: 'tabpanel' } .tab-pane.import-project-pane{ id: 'import-project-pane', role: 'tabpanel' }
= form_for @project, html: { class: 'new_project' } do |f| = form_for @project, html: { class: 'new_project' } do |f|
- if import_sources_enabled? - if import_sources_enabled?
.project-import .project-import.row
.form-group.clearfix .col-sm-12
.form-group.import-btn-container.clearfix
= f.label :visibility_level, class: 'label-light' do #the label here seems wrong = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
Import project from Import project from
.col-sm-12.import-buttons .import-buttons
%div %div
- if github_import_enabled? - if github_import_enabled?
= link_to new_import_github_path, class: 'btn import_github' do = link_to new_import_github_path, class: 'btn import_github' do
...@@ -91,9 +92,10 @@ ...@@ -91,9 +92,10 @@
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
= icon('gitlab', text: 'GitLab export') = icon('gitlab', text: 'GitLab export')
.col-lg-12 .col-lg-12
.js-toggle-content.hide .js-toggle-content.hide.toggle-import-form
%hr %hr
= render "shared/import_form", f: f = render "shared/import_form", f: f
= render 'new_project_fields', f: f, project_name_id: "import-url-name"
.save-project-loader.hide .save-project-loader.hide
.center .center
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment