summaryrefslogtreecommitdiff
path: root/app/controllers/projects/raw_controller.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 12:01:13 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-01 12:01:13 +0100
commitb2a634c352ab23ed1180b7678b5c83db0137c0f7 (patch)
tree8dafc3bfda0d325ce5bfd7292870e54be904320f /app/controllers/projects/raw_controller.rb
parent2679ec40667958aa01c8480978b13a5727cac231 (diff)
downloadgitlab-ce-b2a634c352ab23ed1180b7678b5c83db0137c0f7.tar.gz
Avoid trailing 'charset=' garbage
Diffstat (limited to 'app/controllers/projects/raw_controller.rb')
-rw-r--r--app/controllers/projects/raw_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index 2ab8a6b83bb..87b4d08da0e 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -17,7 +17,8 @@ class Projects::RawController < Projects::ApplicationController
else
headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob))
headers['Content-Disposition'] = 'inline'
- render nothing: true, content_type: get_blob_type
+ headers['Content-Type'] = get_blob_type
+ head :ok # 'render nothing: true' messes up the Content-Type
end
else
render_404