Merge branch '11031-ee-diff-projects' into 'master'

Fixes EE differences for app/views/projects/new.html.haml

Closes #11031

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

app/views/projects/new.html.haml

@@ -16,11 +16,10 @@
         = _('A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}.').html_safe % { among_other_things_link: among_other_things_link }
       %p
         = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.')
-      -# EE-specific start
-      - if ci_cd_projects_available?
-        %p
-          = _('To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>.').html_safe
-      -# EE-specific end
+      = render_if_exists 'projects/new_ci_cd_banner_external_repo'
+      %p
+        - pages_getting_started_guide = link_to _('Pages getting started guide'), help_page_path("user/project/pages/getting_started_part_two", anchor: "fork-a-project-to-get-started-from"), target: '_blank'
+        = _('Information about additional Pages templates and how to install them can be found in our %{pages_getting_started_guide}.').html_safe % { pages_getting_started_guide: pages_getting_started_guide }
       .md
         = brand_new_project_guidelines
       %p
@@ -44,9 +43,7 @@
           %a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab', track_label: 'import_project', track_event: "click_tab" }, role: 'tab' }
             %span.d-none.d-sm-block Import project
             %span.d-block.d-sm-none Import
-        -# EE-specific start
-        = render 'new_ci_cd_only_project_tab', active_tab: active_tab
-        -# EE-specific end
+        = render_if_exists 'projects/new_ci_cd_only_project_tab', active_tab: active_tab
 
       .tab-content.gitlab-tab-content
         .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' }
@@ -73,9 +70,7 @@
               %h4 No import options available
               %p Contact an administrator to enable options for importing your project.
 
-        -# EE-specific start
-        = render 'new_ci_cd_only_project_pane', active_tab: active_tab
-        -# EE-specific end
+        = render_if_exists 'projects/new_ci_cd_only_project_pane', active_tab: active_tab
 
 .save-project-loader.d-none
   .center

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

+- if ci_cd_projects_available?
+  %p
+    = _('To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>.').html_safe

locale/gitlab.pot

@@ -6434,6 +6434,9 @@ msgstr ""
 msgid "Inform users without uploaded SSH keys that they can't push over SSH until one is added"
 msgstr ""
 
+msgid "Information about additional Pages templates and how to install them can be found in our %{pages_getting_started_guide}."
+msgstr ""
+
 msgid "Inline"
 msgstr ""
 
@@ -8355,6 +8358,9 @@ msgstr ""
 msgid "Pages Domains"
 msgstr ""
 
+msgid "Pages getting started guide"
+msgstr ""
+
 msgid "Pagination|Last »"
 msgstr ""