deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes/api

Browse source 
Conflicts:
	lib/api/projects.rb
This commit is contained in:
Sebastian Ziebell 2013-03-05 22:29:49 +01:00
commit 61cfa2a7a6
146 changed files with 1562 additions and 859 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/routes.rb
View file

@ -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