Download as
Browse Code »

Commit 202807c21a61696ad50aadf43781ca15b9deaede

Authored by Saito
1 parent c71a76e7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

remove detect_enoding. detect_encoding means force_encoding to the file.data's e… 

…ncoding, not encoding to utf8. will cause encoding problem.
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/views/refs/_tree.html.haml
  Diff comments   View file @202807c
@@ -42,9 +42,9 @@ @@ -42,9 +42,9 @@
42 .readme 42 .readme
43 - if content.name =~ /\.(md|markdown)$/i 43 - if content.name =~ /\.(md|markdown)$/i
44 = preserve do 44 = preserve do
45 - = markdown(content.data.detect_encoding!) 45 + = markdown(content.data)
46 - else 46 - else
47 - = simple_format(content.data.detect_encoding!) 47 + = simple_format(content.data)
48 48
49 - if params[:path] 49 - if params[:path]
50 - history_path = tree_file_project_ref_path(@project, @ref, params[:path]) 50 - history_path = tree_file_project_ref_path(@project, @ref, params[:path])
app/views/refs/_tree_file.html.haml
  Diff comments   View file @202807c
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 #tree-readme-holder 13 #tree-readme-holder
14 .readme 14 .readme
15 = preserve do 15 = preserve do
16 - = markdown(file.data.detect_encoding!) 16 + = markdown(file.data)
17 - else 17 - else
18 .view_file_content 18 .view_file_content
19 - unless file.empty? 19 - unless file.empty?