From 80f61b4035607d7cd87de993b8f5e996bde3481f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Sep 2019 14:02:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/routes/group.rb   | 2 +-
 config/routes/project.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'config/routes')

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 2cf9eb82447..37bc6085931 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -17,7 +17,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       get :details, as: :details_group
       get :activity, as: :activity_group
       put :transfer, as: :transfer_group
-      # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-ce/issues/49693
+      # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-foss/issues/49693
       get 'shared', action: :show, as: :group_shared
       get 'archived', action: :show, as: :group_archived
     end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index c1273db8ee5..4a2898915b1 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -195,6 +195,12 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           defaults: { format: 'json' },
           constraints: { key: %r{[^/]+}, template_type: %r{issue|merge_request}, format: 'json' }
 
+      get '/description_templates/names/:template_type',
+          to: 'templates#names',
+          as: :template_names,
+          defaults: { format: 'json' },
+          constraints: { template_type: %r{issue|merge_request}, format: 'json' }
+
       resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do
         member do
           get :branches
-- 
cgit v1.2.1