Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 2 insertions, 28 deletions

diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb
index 323f59d3373..5496bd5f682 100644
--- a/lib/gitlab/template/gitlab_ci_yml_template.rb
+++ b/lib/gitlab/template/gitlab_ci_yml_template.rb
@@ -4,8 +4,7 @@ module Gitlab
   module Template
     class GitlabCiYmlTemplate < BaseTemplate
       BASE_EXCLUDED_PATTERNS = [%r{\.latest\.}].freeze
-
-      TEMPLATES_WITH_LATEST_VERSION = {}.freeze
+      BASE_DIR = 'lib/gitlab/ci/templates'
 
       def description
         "# This file is a template, and might need editing before it works on your project."
@@ -45,7 +44,7 @@ module Gitlab
         end
 
         def base_dir
-          Rails.root.join('lib/gitlab/ci/templates')
+          Rails.root.join(BASE_DIR)
         end
 
         def finder(project = nil)
@@ -57,31 +56,6 @@ module Gitlab
             excluded_patterns: self.excluded_patterns
           )
         end
-
-        override :find
-        def find(key, project = nil)
-          if try_redirect_to_latest?(key, project)
-            key += '.latest'
-          end
-
-          super(key, project)
-        end
-
-        private
-
-        # To gauge the impact of the latest template,
-        # you can redirect the stable template to the latest template by enabling the feature flag.
-        # See https://docs.gitlab.com/ee/development/cicd/templates.html#versioning for more information.
-        def try_redirect_to_latest?(key, project)
-          return false unless templates_with_latest_version[key]
-
-          flag_name = "redirect_to_latest_template_#{key.underscore.tr('/', '_')}"
-          ::Feature.enabled?(flag_name, project, default_enabled: :yaml)
-        end
-
-        def templates_with_latest_version
-          TEMPLATES_WITH_LATEST_VERSION
-        end
       end
     end
   end