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 @@
.readme
- if content.name =~ /\.(md|markdown)$/i
= preserve do
= markdown(content.data.force_encoding('UTF-8'))
= markdown(content.data.detect_encoding!)
- else
= simple_format(content.data.force_encoding('UTF-8'))
= simple_format(content.data.detect_encoding!)
- if params[:path]
- history_path = tree_file_project_ref_path(@project, @ref, params[:path])
......
......@@ -13,7 +13,7 @@
#tree-readme-holder
.readme
= preserve do
= markdown(file.data.force_encoding('UTF-8'))
= markdown(file.data.detect_encoding!)
- else
.view_file_content
- unless file.empty?
......
# Patch Strings to enable detect_encoding! on views
require 'charlock_holmes/string'
module Gitlabhq
module Encode
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