diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /app/views/projects/_project_templates.html.haml | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/views/projects/_project_templates.html.haml')
| -rw-r--r-- | app/views/projects/_project_templates.html.haml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml index 79221c59ae4..d1ff52548cd 100644 --- a/app/views/projects/_project_templates.html.haml +++ b/app/views/projects/_project_templates.html.haml @@ -5,17 +5,11 @@ %li.built-in-tab %a.nav-link.active{ href: "#built-in", data: { toggle: 'tab'} } = _('Built-in') - %span.badge.badge-pill= Gitlab::ProjectTemplate.all.count - %li.sample-data-templates-tab - %a.nav-link{ href: "#sample-data-templates", data: { toggle: 'tab'} } - = _('Sample Data') - %span.badge.badge-pill= Gitlab::SampleDataTemplate.all.count + %span.badge.badge-pill= Gitlab::SampleDataTemplate.all.count + Gitlab::ProjectTemplate.all.count .tab-content .project-templates-buttons.import-buttons.tab-pane.active#built-in - = render partial: 'projects/project_templates/template', collection: Gitlab::ProjectTemplate.all - .project-templates-buttons.import-buttons.tab-pane#sample-data-templates - = render partial: 'projects/project_templates/template', collection: Gitlab::SampleDataTemplate.all + = render partial: 'projects/project_templates/template', collection: Gitlab::SampleDataTemplate.all + Gitlab::ProjectTemplate.all .project-fields-form = render 'projects/project_templates/project_fields_form' |