summaryrefslogtreecommitdiff
path: root/app/controllers/projects/uploads_controller.rb
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 /app/controllers/projects/uploads_controller.rb
parentca504a77fe994da893cd0632de5e0e7ea5b729fc (diff)
downloadgitlab-ce-9729cc584f5758395960416f308a9c45f698cdee.tar.gz
implement Project::UploadsController
Diffstat (limited to 'app/controllers/projects/uploads_controller.rb')
-rw-r--r--app/controllers/projects/uploads_controller.rb16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
new file mode 100644
index 00000000000..1c9fb1c86fb
--- /dev/null
+++ b/app/controllers/projects/uploads_controller.rb
@@ -0,0 +1,16 @@
+class Projects::UploadsController < Projects::ApplicationController
+ layout 'project'
+
+ before_filter :project
+
+ def show
+ folder_id = params[:folder_id]
+ filename = params[:filename]
+
+ uploader = FileUploader.new("#{Rails.root}/uploads","#{@project.path_with_namespace}/#{folder_id}")
+ uploader.retrieve_from_store!(filename)
+
+ disposition = uploader.image? ? 'inline' : 'attachment'
+ send_file uploader.file.path, disposition: disposition
+ end
+end