Commit 1ae05139 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '358375-update-import-checkbox' into 'master'

Update import checkbox to pajamas

See merge request gitlab-org/gitlab!84806
parents 55ddd809 55a03658
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
.js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') } .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'import') }
= form_for @project, html: { class: 'new_project gl-show-field-errors js-project-import' } do |f| = gitlab_ui_form_for @project, html: { class: 'new_project gl-show-field-errors js-project-import' } do |f|
%hr %hr
= render "shared/import_form", f: f = render "shared/import_form", f: f
= render 'projects/new_project_fields', f: f, project_name_id: "import-url-name", hide_init_with_readme: true, track_label: track_label = render 'projects/new_project_fields', f: f, project_name_id: "import-url-name", hide_init_with_readme: true, track_label: track_label
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
:preserve :preserve
#{h(@project.import_state.last_error)} #{h(@project.import_state.last_error)}
= form_for @project, url: project_import_path(@project), method: :post, html: { class: 'js-project-import' } do |f| = gitlab_ui_form_for @project, url: project_import_path(@project), method: :post, html: { class: 'js-project-import' } do |f|
= render "shared/import_form", f: f = render "shared/import_form", f: f
.form-actions .form-actions
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- track_label = local_assigns.fetch(:track_label, 'cicd_for_external_repo') - track_label = local_assigns.fetch(:track_label, 'cicd_for_external_repo')
#ci-cd-project-pane.tab-pane #ci-cd-project-pane.tab-pane
= form_for @project, html: { class: 'new_project' } do |f| = gitlab_ui_form_for @project, html: { class: 'new_project' } do |f|
.project-import.row .project-import.row
.col-lg-12 .col-lg-12
%h4 %h4
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
- return unless License.feature_available?(:repository_mirrors) - return unless License.feature_available?(:repository_mirrors)
.form-group .form-group
= f.label :mirror, class: 'label-bold' do = f.gitlab_ui_checkbox_component :mirror,
= f.check_box :mirror, disabled: true _('Mirror repository'),
%strong= _('Mirror repository') checkbox_options: { disabled: true }
.form-text.text-muted .form-text.text-muted
= _("Automatically update this project's branches and tags from the upstream repository every hour.") = _("Automatically update this project's branches and tags from the upstream repository every hour.")
- if Gitlab::CurrentSettings.should_check_namespace_plan? - if Gitlab::CurrentSettings.should_check_namespace_plan?
......
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