From d193734fb97510ffc55f84c2f3a0a3692cd2d859 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 28 May 2021 06:10:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/issuables_description_templates_helper.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/helpers/issuables_description_templates_helper.rb') diff --git a/app/helpers/issuables_description_templates_helper.rb b/app/helpers/issuables_description_templates_helper.rb index 5f69098de56..6cafde65c5c 100644 --- a/app/helpers/issuables_description_templates_helper.rb +++ b/app/helpers/issuables_description_templates_helper.rb @@ -29,17 +29,12 @@ module IssuablesDescriptionTemplatesHelper def issuable_templates(project, issuable_type) @template_types ||= {} @template_types[project.id] ||= {} - @template_types[project.id][issuable_type] ||= TemplateFinder.all_template_names_hash_or_array(project, issuable_type) + @template_types[project.id][issuable_type] ||= TemplateFinder.all_template_names(project, issuable_type.pluralize) end def issuable_templates_names(issuable) all_templates = issuable_templates(ref_project, issuable.to_ability_name) - - if ref_project.inherited_issuable_templates_enabled? - all_templates.values.flatten.map { |tpl| tpl[:name] if tpl[:project_id] == ref_project.id }.compact.uniq - else - all_templates.map { |template| template[:name] } - end + all_templates.values.flatten.map { |tpl| tpl[:name] if tpl[:project_id] == ref_project.id }.compact.uniq end def selected_template(issuable) -- cgit v1.2.3