Commit 39def0dc authored by Gabriel Mazetto's avatar Gabriel Mazetto

Better fix for encoding problems on rendering of inline file visualizations like README files.

parent eb5749ed
...@@ -42,9 +42,9 @@ ...@@ -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.force_encoding('UTF-8')) = markdown(content.data.detect_encoding!)
- else - else
= simple_format(content.data.force_encoding('UTF-8')) = simple_format(content.data.detect_encoding!)
- 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])
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#tree-readme-holder #tree-readme-holder
.readme .readme
= preserve do = preserve do
= markdown(file.data.force_encoding('UTF-8')) = markdown(file.data.detect_encoding!)
- else - else
.view_file_content .view_file_content
- unless file.empty? - unless file.empty?
......
# Patch Strings to enable detect_encoding! on views
require 'charlock_holmes/string'
module Gitlabhq module Gitlabhq
module Encode module Encode
extend self extend self
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment