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/config
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-28 18:31:03 +0300
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-28 18:31:03 +0300
commit903b2c24486f95324ee6d04863fa261efcec0f29 (patch)
tree216a733cb4c8cef01eb400b64dc94c487d4430b8 /config
parent6460489babe3cd25358800804f6befc1bd242f22 (diff)
parent802126179f6b755fab2eaedde038af48f004e97d (diff)
Merge branch 'fix/gb/environments-folders-route' into 'master'
Fix environment folder route when special chars present Closes #29922 See merge request !10250
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 823e0614aeb..7244f851869 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -166,7 +166,7 @@ constraints(ProjectUrlConstrainer.new) do
end
collection do
- get :folder, path: 'folders/:id'
+ get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ }
end
end