Merge branch 'revert-fb5bb717' into 'master'

Revert "Merge branch 'yogi-hide-templates-buttons' into 'master'"

See merge request gitlab-org/gitlab!60765

app/views/projects/new.html.haml

@@ -51,12 +51,11 @@
             = render 'new_project_fields', f: f, project_name_id: "blank-project-name"
 
         #create-from-template-pane.tab-pane.js-toggle-container.px-0.pb-0{ class: active_when(active_tab == 'template'), role: 'tabpanel' }
-          .gl-card.gl-my-5
-            .gl-card-body
-              %div
-                - contributing_templates_url = 'https://gitlab.com/gitlab-org/project-templates/contributing'
-                - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: contributing_templates_url }
-                = _('Learn how to %{link_start}contribute to the built-in templates%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
+          .card.card-slim.m-4.p-4
+            %div
+              - contributing_templates_url = 'https://gitlab.com/gitlab-org/project-templates/contributing'
+              - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: contributing_templates_url }
+              = _('Learn how to %{link_start}contribute to the built-in templates%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
           = form_for @project, html: { class: 'new_project' } do |f|
             .project-template
               .form-group

changelogs/unreleased/yogi-hide-templates-buttons.yml

----
-title: Remove template tabs in new project page for GitLab.com
-merge_request: 59083
-author: Yogi (@yo)
-type: changed

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

@@ -2,22 +2,21 @@
   - project_template_count = current_user.available_custom_project_templates.count
   - group_id = params[:namespace_id]
 
-  - unless Gitlab.com?
-    .project-templates-buttons
-      %ul.nav-tabs.nav-links.nav.scrolling-tabs
-        %li.built-in-tab
-          %a.nav-link.active{ href: "#built-in", data: { toggle: 'tab'} }
-            = _('Built-in')
-            %span.badge.badge-pill=  Gitlab::ProjectTemplate.all.count + Gitlab::SampleDataTemplate.all.count
-        %li.custom-instance-project-templates-tab
-          %a.nav-link.js-custom-instance-project-templates-nav-link.qa-instance-templates-tab{ href: "#custom-instance-project-templates", data: { toggle: 'tab'} }
-            = _('Instance')
-            %span.badge.badge-pill.qa-instance-template-tab-badge= project_template_count
-        %li.custom-group-project-templates-tab
-          %a.nav-link.js-custom-group-project-templates-nav-link.qa-group-templates-tab{ href: "#custom-group-project-templates", data: { toggle: 'tab'} }
-            = _('Group')
-            %span.badge.badge-pill.qa-group-template-tab-badge
-              = group_project_templates_count(group_id)
+  .project-templates-buttons
+    %ul.nav-tabs.nav-links.nav.scrolling-tabs
+      %li.built-in-tab
+        %a.nav-link.active{ href: "#built-in", data: { toggle: 'tab'} }
+          = _('Built-in')
+          %span.badge.badge-pill=  Gitlab::ProjectTemplate.all.count + Gitlab::SampleDataTemplate.all.count
+      %li.custom-instance-project-templates-tab
+        %a.nav-link.js-custom-instance-project-templates-nav-link.qa-instance-templates-tab{ href: "#custom-instance-project-templates", data: { toggle: 'tab'} }
+          = _('Instance')
+          %span.badge.badge-pill.qa-instance-template-tab-badge= project_template_count
+      %li.custom-group-project-templates-tab
+        %a.nav-link.js-custom-group-project-templates-nav-link.qa-group-templates-tab{ href: "#custom-group-project-templates", data: { toggle: 'tab'} }
+          = _('Group')
+          %span.badge.badge-pill.qa-group-template-tab-badge
+            = group_project_templates_count(group_id)
 
   .tab-content
     .project-templates-buttons.import-buttons.tab-pane.active#built-in