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

remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem.

Browse source
This commit is contained in:
Saito 2012-05-30 11:56:00 +08:00
parent c71a76e71a
commit 202807c21a
2 changed files with 3 additions and 3 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.detect_encoding!) = markdown(content.data)
- else - else
= simple_format(content.data.detect_encoding!) = simple_format(content.data)
- 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])

2
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.detect_encoding!) = markdown(file.data)
- else - else
.view_file_content .view_file_content
- unless file.empty? - unless file.empty?