summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-02-14 19:52:45 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-17 22:21:13 +0100
commit9729cc584f5758395960416f308a9c45f698cdee (patch)
treee4b45ad34333e1a9ca9035bfddf5e7d2ef56932c /config
parentca504a77fe994da893cd0632de5e0e7ea5b729fc (diff)
downloadgitlab-ce-9729cc584f5758395960416f308a9c45f698cdee.tar.gz
implement Project::UploadsController
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index bd659ddeabd..d29ad8db639 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -93,8 +93,7 @@ Gitlab::Application.routes.draw do
#
# Attachments serving
#
- get 'files/:type/:id/:filename' => 'files#download_notes', constraints: { id: /\d+/, type: /[a-z]+/, filename: /.+/ }
- get 'files/:namespace/:project/:folder_id/:filename' => 'files#download_files', constraints: { namespace: /[^\/]+/, project: /[a-zA-Z.\/0-9_\-]+/, filename: /.+/ }
+ get 'files/:type/:id/:filename' => 'files#download', constraints: { id: /\d+/, type: /[a-z]+/, filename: /.+/ }
#
# Admin Area
@@ -257,6 +256,8 @@ Gitlab::Application.routes.draw do
end
end
+ get '/uploads/:folder_id/:filename' => 'uploads#show', constraints: { filename: /.+/ }
+
get '/compare/:from...:to' => 'compare#show', :as => 'compare',
:constraints => { from: /.+/, to: /.+/ }