diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/lfs_storage_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/projects/raw_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/projects/uploads_controller.rb | 3 | ||||
-rw-r--r-- | app/controllers/uploads_controller.rb | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb index 9005b104e90..209c6935ab6 100644 --- a/app/controllers/projects/lfs_storage_controller.rb +++ b/app/controllers/projects/lfs_storage_controller.rb @@ -12,7 +12,9 @@ class Projects::LfsStorageController < Projects::GitHttpClientController return end - send_file lfs_object.file.path, content_type: "application/octet-stream" + #send_file lfs_object.file.path, content_type: "application/octet-stream" + data = open(lfs_object.file.url) + send_data data.read, content_type: "application/octet-stream" end def upload_authorize diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index 10d24da16d7..ef747de0004 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -31,7 +31,9 @@ class Projects::RawController < Projects::ApplicationController lfs_object = find_lfs_object if lfs_object && lfs_object.project_allowed_access?(@project) - send_file lfs_object.file.path, filename: @blob.name, disposition: 'attachment' + # send_file lfs_object.file.path, filename: @blob.name, disposition: 'attachment' + data = open(lfs_object.file.url) + send_data data.read, filename: @blob.name, disposition: 'attachment' else render_404 end diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb index e617be8f9fb..78b2d86d10a 100644 --- a/app/controllers/projects/uploads_controller.rb +++ b/app/controllers/projects/uploads_controller.rb @@ -25,7 +25,8 @@ class Projects::UploadsController < Projects::ApplicationController return render_404 if uploader.nil? || !uploader.file.exists? disposition = uploader.image_or_video? ? 'inline' : 'attachment' - send_file uploader.file.path, disposition: disposition + data = open(uploader.file.url) + send_data data.read, disposition: disposition end private diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 509f4f412ca..9fe69bd80b7 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -14,7 +14,8 @@ class UploadsController < ApplicationController end disposition = uploader.image? ? 'inline' : 'attachment' - send_file uploader.file.path, disposition: disposition + data = open(uploader.file.url) + send_data data.read, disposition: disposition end private |