diff options
author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-05 22:29:49 +0100 |
---|---|---|
committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-05 22:29:49 +0100 |
commit | 61cfa2a7a6e1d4557b69e17c537656e8a0201ac8 (patch) | |
tree | f868b5a1d870a42afe57e2b4dbbf35c9445c002b /config/routes.rb | |
parent | d269d107d86c600ab2add651f47cced8f601ae84 (diff) | |
parent | 6beae84ea37e03e68affd2b69fba25f45a4e5386 (diff) | |
download | gitlab-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.rb | 2 |
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 |