diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-13 11:39:07 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-13 11:39:07 +0000 |
| commit | 8c70700a81ce9d6c38adeb53f77a5d0e3afdd755 (patch) | |
| tree | de0a7e9fcf1471fe07f24a455f3f71f01202e368 /app | |
| parent | 38707042fc7da06cae8e4f8dfa0650ab8d924062 (diff) | |
| download | gitlab-ce-8c70700a81ce9d6c38adeb53f77a5d0e3afdd755.tar.gz | |
Resolve "Choosing “Initialize repo with a README” breaks project created from template"
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_import_project_pane.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_new_project_fields.html.haml | 20 | ||||
| -rw-r--r-- | app/views/projects/_project_templates.html.haml | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml index 70e1c557547..32da38f14b9 100644 --- a/app/views/projects/_import_project_pane.html.haml +++ b/app/views/projects/_import_project_pane.html.haml @@ -63,4 +63,4 @@ = 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" + = render 'new_project_fields', f: f, project_name_id: "import-url-name", hide_init_with_readme: true diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml index 3b6090211c0..001e65c0f66 100644 --- a/app/views/projects/_new_project_fields.html.haml +++ b/app/views/projects/_new_project_fields.html.haml @@ -1,5 +1,6 @@ - visibility_level = params.dig(:project, :visibility_level) || default_project_visibility - ci_cd_only = local_assigns.fetch(:ci_cd_only, false) +- hide_init_with_readme = local_assigns.fetch(:hide_init_with_readme, false) .row{ id: project_name_id } = f.hidden_field :ci_cd_only, value: ci_cd_only @@ -48,15 +49,16 @@ = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer' = render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false -.form-group.row.initialize-with-readme-setting - %div{ :class => "col-sm-12" } - .form-check - = check_box_tag 'project[initialize_with_readme]', '1', false, class: 'form-check-input' - = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do - .option-title - %strong Initialize repository with a README - .option-description - Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository. +- if !hide_init_with_readme + .form-group.row.initialize-with-readme-setting + %div{ :class => "col-sm-12" } + .form-check + = check_box_tag 'project[initialize_with_readme]', '1', false, class: 'form-check-input' + = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do + .option-title + %strong Initialize repository with a README + .option-description + Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository. = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4 = link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel' diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml index e90a6355214..0f6f3ad6d5e 100644 --- a/app/views/projects/_project_templates.html.haml +++ b/app/views/projects/_project_templates.html.haml @@ -5,4 +5,4 @@ .project-fields-form = render 'projects/project_templates/project_fields_form' - = render 'projects/new_project_fields', f: f, project_name_id: "template-project-name" + = render 'projects/new_project_fields', f: f, project_name_id: "template-project-name", hide_init_with_readme: true |