summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-04-19 01:42:27 +0200
committerTomasz Maczukin <tomasz@maczukin.pl>2016-04-19 23:18:43 +0200
commit0a13f5f86487d7a0dcd26c383a2e32cb496fbcfe (patch)
tree09112a9e7895745082e5e0eed4e4f9dc5cbdbaaf
parentd2dc139d0fab19fc2290a8d7da5785366392563c (diff)
downloadgitlab-ce-0a13f5f86487d7a0dcd26c383a2e32cb496fbcfe.tar.gz
Use Rails-way to send file by X-Sendfile
-rw-r--r--app/controllers/projects/builds_controller.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index d1a9b47a518..b8b9e78427d 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -63,14 +63,11 @@ class Projects::BuildsController < Projects::ApplicationController
end
def raw
- response.headers['Content-Type'] = 'text/plain; charset=utf-8'
if @build.has_trace?
- response.headers['X-Sendfile'] = @build.path_to_trace
+ send_file @build.path_to_trace, type: 'text/plain; charset=utf-8', disposition: 'inline'
else
- response.status = 404
+ render_404
end
-
- render nothing: true
end
private