Merge branch...

Merge branch 'ee-50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template' into 'master'

(Port from CE) create project: hide readme checkbox on all tabs except for "blank project" page

See merge request gitlab-org/gitlab-ee!7332

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

app/views/projects/_new_project_fields.html.haml

 - 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'

ee/app/views/projects/_new_ci_cd_only_project_pane.html.haml

@@ -28,4 +28,4 @@
         .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'ci_cd_only') }
           %hr
             = render "shared/import_form", f: f, ci_cd_only: true
-            = render 'new_project_fields', f: f, project_name_id: "import-url-name", ci_cd_only: true
+            = render 'new_project_fields', f: f, project_name_id: "import-url-name", ci_cd_only: true, hide_init_with_readme: true

ee/app/views/projects/_project_templates.html.haml

@@ -21,7 +21,7 @@
   .project-fields-form
     = render 'projects/project_templates/project_fields_form'
     = f.hidden_field(:use_custom_template, value: false)
-    = 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
 
 - else
   = render_ce 'projects/project_templates', f: f

ee/changelogs/unreleased/ee-50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template.yml

+---
+title: remove readme checkbox from "create project" page
+merge_request: 7332
+author:
+type: other