deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed encoding problems with plain/text blobs being sent without charset.

Browse source
This commit is contained in:
Gabriel Mazetto 2012-05-26 15:20:35 -03:00
parent cc8369144d
commit eb5749ed39
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/refs_controller.rb
View file

@ -1,4 +1,5 @@
class RefsController < ApplicationController
include Gitlabhq::Encode
before_filter :project
# Authorize
@ -49,9 +50,16 @@ class RefsController < ApplicationController
def blob
if @tree.is_blob?
if @tree.text?
encoding = detect_encoding(@tree.data)
mime_type = encoding ? "text/plain; charset=#{encoding}" : "text/plain"
else
mime_type = @tree.mime_type
end
send_data(
@tree.data,
:type => @tree.text? ? "text/plain" : @tree.mime_type,
:type => mime_type,
:disposition => 'inline',
:filename => @tree.name
)