Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2019-02-25 23:43:26 +0300
committerMichael Kozono <mkozono@gmail.com>2019-02-25 23:43:26 +0300
commitea6945b8113160f2009daa854e612eb009690a2a (patch)
treef6312ab4736e0ec355ed7840189267188900f233 /lib
parent9ffdd736f86b053fd02752e7f86f63229aebf602 (diff)
Revert "Merge branch 'sh-fix-cpp-templates-404' into 'master'"
This reverts commit 4b282e9ce1ae246c4538b3ede18d1380ea778029, reversing changes made to b6f37434a7022be1be40c0d0519aea3ceca25ea5.
Diffstat (limited to 'lib')
-rw-r--r--lib/api/project_templates.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/project_templates.rb b/lib/api/project_templates.rb
index 119902a189c..d05ddad7466 100644
--- a/lib/api/project_templates.rb
+++ b/lib/api/project_templates.rb
@@ -36,10 +36,7 @@ module API
optional :project, type: String, desc: 'The project name to use when expanding placeholders in the template. Only affects licenses'
optional :fullname, type: String, desc: 'The full name of the copyright holder to use when expanding placeholders in the template. Only affects licenses'
end
- # The regex is needed to ensure a period (e.g. agpl-3.0)
- # isn't confused with a format type. We also need to allow encoded
- # values (e.g. C%2B%2B for C++), so allow % and + as well.
- get ':id/templates/:type/:name', requirements: { name: /[\w%.+-]+/ } do
+ get ':id/templates/:type/:name', requirements: { name: /[\w\.-]+/ } do
template = TemplateFinder
.build(params[:type], user_project, name: params[:name])
.execute