diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-28 09:10:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-28 09:10:48 +0300 |
| commit | d193734fb97510ffc55f84c2f3a0a3692cd2d859 (patch) | |
| tree | d01546164fb50d89639e8f4c39e81776bb1347c6 /lib | |
| parent | 50135e6e0460e9276588670e3235a95f19a1660d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -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 |