diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-24 13:53:30 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-24 13:53:30 +0300 |
| commit | cf2c5396e014e54db7a3183380a8ed2b77b2e6e1 (patch) | |
| tree | 1dbf75efad1006ff2aff91562e573d29455ec457 /app/controllers/projects/raw_controller.rb | |
| parent | bd71438d6accb61a33b520177aeb92a3614eedb5 (diff) | |
Explain why we mangle blob content types
Diffstat (limited to 'app/controllers/projects/raw_controller.rb')
| -rw-r--r-- | app/controllers/projects/raw_controller.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb index 87b4d08da0e..d9723acb1d9 100644 --- a/app/controllers/projects/raw_controller.rb +++ b/app/controllers/projects/raw_controller.rb @@ -1,6 +1,7 @@ # Controller for viewing a file's raw class Projects::RawController < Projects::ApplicationController include ExtractsPath + include BlobHelper before_action :require_non_empty_project before_action :assign_ref_vars @@ -17,7 +18,7 @@ class Projects::RawController < Projects::ApplicationController else headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob)) headers['Content-Disposition'] = 'inline' - headers['Content-Type'] = get_blob_type + headers['Content-Type'] = safe_content_type(@blob) head :ok # 'render nothing: true' messes up the Content-Type end else @@ -27,16 +28,6 @@ class Projects::RawController < Projects::ApplicationController private - def get_blob_type - if @blob.text? - 'text/plain; charset=utf-8' - elsif @blob.image? - @blob.content_type - else - 'application/octet-stream' - end - end - def send_lfs_object lfs_object = find_lfs_object |