Merge branch 'zj-sort-templates' into 'master'

Sort templates when fetching them

Closes #37153

See merge request !13920

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/template/base_template.rb b/lib/gitlab/template/base_template.rb
index 7ebec8e2cff..7393574ac13 100644
--- a/lib/gitlab/template/base_template.rb
+++ b/lib/gitlab/template/base_template.rb
@@ -18,6 +18,10 @@ module Gitlab
         { name: name, content: content }
       end
 
+      def <=>(other)
+        name <=> other.name
+      end
+
       class << self
         def all(project = nil)
           if categories.any?
@@ -58,7 +62,7 @@ module Gitlab
           directory = category_directory(category)
           files = finder(project).list_files_for(directory)
 
-          files.map { |f| new(f, project) }
+          files.map { |f| new(f, project) }.sort
         end
 
         def category_directory(category)