diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-28 15:31:03 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-28 15:31:03 +0000 |
| commit | 903b2c24486f95324ee6d04863fa261efcec0f29 (patch) | |
| tree | 216a733cb4c8cef01eb400b64dc94c487d4430b8 /config/routes | |
| parent | 6460489babe3cd25358800804f6befc1bd242f22 (diff) | |
| parent | 802126179f6b755fab2eaedde038af48f004e97d (diff) | |
| download | gitlab-ce-903b2c24486f95324ee6d04863fa261efcec0f29.tar.gz | |
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/routes')
| -rw-r--r-- | config/routes/project.rb | 2 |
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 |