diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/api/project_templates.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/api/project_templates.rb')
| -rw-r--r-- | lib/api/project_templates.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/project_templates.rb b/lib/api/project_templates.rb index 5d6f67ccbae..acf9bfece65 100644 --- a/lib/api/project_templates.rb +++ b/lib/api/project_templates.rb @@ -26,7 +26,7 @@ module API use :pagination end get ':id/templates/:type' do - templates = TemplateFinder.all_template_names_array(user_project, params[:type]) + templates = TemplateFinder.all_template_names(user_project, params[:type]).values.flatten present paginate(::Kaminari.paginate_array(templates)), with: Entities::TemplatesList end |