Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpilsner <pilsner@teamlegoui-Mac-Pro.local>2015-09-03 12:55:43 +0300
committerpilsner <pilsner@teamlegoui-Mac-Pro.local>2015-09-04 07:06:02 +0300
commit4144c59941e8e91bbaff2c68e757af0f01f7997d (patch)
treecb28256c8584c13cafd07dfe56e248ec2c6997be /app/controllers/projects/raw_controller.rb
parent996f51559b428102b4c9540617ee9f0847246d74 (diff)
add Content-Type header of raw image file
Add Content-Type header to fix a bug which IE can't show image in markdown when the image is from raw. modified: CHANGELOG modified: app/controllers/projects/raw_controller.rb modified: spec/controllers/projects/raw_controller_spec.rb
Diffstat (limited to 'app/controllers/projects/raw_controller.rb')
-rw-r--r--app/controllers/projects/raw_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index 1a3df40dc75..5f6fbce795e 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -29,6 +29,8 @@ class Projects::RawController < Projects::ApplicationController
def get_blob_type
if @blob.text?
'text/plain; charset=utf-8'
+ elsif @blob.image?
+ @blob.content_type
else
'application/octet-stream'
end