From 4958d96e262f6b31b2850123e4949536555b2d29 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 6 Jun 2023 12:07:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/finders/template_finder.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'app/finders') diff --git a/app/finders/template_finder.rb b/app/finders/template_finder.rb index c9b5711949f..a8dd2cde20f 100644 --- a/app/finders/template_finder.rb +++ b/app/finders/template_finder.rb @@ -27,14 +27,9 @@ class TemplateFinder end def type_allowed?(type) - case type.to_s - when 'licenses' - true - when 'metrics_dashboard_ymls' - !Feature.enabled?(:remove_monitor_metrics) - else - VENDORED_TEMPLATES.key?(type) - end + return true if type.to_s == 'licenses' + + VENDORED_TEMPLATES.key?(type) end end -- cgit v1.2.3