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

Merge pull request #833 from Nek-/patch-utf8

Browse source 
Added force utf8 encoding
This commit is contained in:
Dmitriy Zaporozhets 2012-05-19 03:34:20 -07:00
parent 5d24082787 8c7c43b94f
commit f33cf247b6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/refs/_tree.html.haml
View file

@ -42,9 +42,9 @@
.readme .readme
- if content.name =~ /\.(md|markdown)$/i - if content.name =~ /\.(md|markdown)$/i
= preserve do = preserve do
= markdown(content.data) = markdown(content.data.force_encoding('UTF-8'))
- else - else
= simple_format(content.data) = simple_format(content.data.force_encoding('UTF-8'))
- if params[:path] - if params[:path]
- history_path = tree_file_project_ref_path(@project, @ref, params[:path]) - history_path = tree_file_project_ref_path(@project, @ref, params[:path])

6
app/views/refs/_tree_file.html.haml
View file

@ -13,7 +13,7 @@
#tree-readme-holder #tree-readme-holder
.readme .readme
= preserve do = preserve do
= markdown(file.data) = markdown(file.data.force_encoding('UTF-8'))
- else - else
.view_file_content .view_file_content
- unless file.empty? - unless file.empty?
@ -28,9 +28,9 @@
%img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else - else
%center %center
= link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do
%div %div
%br %br
= image_tag "download.png", :width => 64 = image_tag "download.png", :width => 64
%h3 %h3
Download (#{file.mb_size}) Download (#{file.mb_size})