summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-03-05 22:29:49 +0100
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-03-05 22:29:49 +0100
commit61cfa2a7a6e1d4557b69e17c537656e8a0201ac8 (patch)
treef868b5a1d870a42afe57e2b4dbbf35c9445c002b /config/routes.rb
parentd269d107d86c600ab2add651f47cced8f601ae84 (diff)
parent6beae84ea37e03e68affd2b69fba25f45a4e5386 (diff)
downloadgitlab-ce-61cfa2a7a6e1d4557b69e17c537656e8a0201ac8.tar.gz
Merge branch 'master' into fixes/api
Conflicts: lib/api/projects.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 10536a6e529..c8e7c8ee4f8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -49,7 +49,7 @@ Gitlab::Application.routes.draw do
#
# Attachments serving
#
- get 'files/:type/:id/:filename' => 'files#download', constraints: { id: /\d+/, type: /[a-z]+/, filename: /[a-zA-Z.0-9_\-\+]+/ }
+ get 'files/:type/:id/:filename' => 'files#download', constraints: { id: /\d+/, type: /[a-z]+/, filename: /.+/ }
#
# Admin Area