Download as
Browse Code »

Commit 39def0dcbb17a3f5883d6cb1965f815b537e5890

Authored by Gabriel Mazetto
1 parent eb5749ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 3 changed files with 6 additions and 3 deletions   Show diff stats
app/views/refs/_tree.html.haml
  Diff comments   View file @39def0d
... ... @@ -42,9 +42,9 @@
42 42 .readme
43 43 - if content.name =~ /\.(md|markdown)$/i
44 44 = preserve do
45   - = markdown(content.data.force_encoding('UTF-8'))
  45 + = markdown(content.data.detect_encoding!)
46 46 - else
47   - = simple_format(content.data.force_encoding('UTF-8'))
  47 + = simple_format(content.data.detect_encoding!)
48 48  
49 49 - if params[:path]
50 50 - history_path = tree_file_project_ref_path(@project, @ref, params[:path])
... ...
app/views/refs/_tree_file.html.haml
  Diff comments   View file @39def0d
... ... @@ -13,7 +13,7 @@
13 13 #tree-readme-holder
14 14 .readme
15 15 = preserve do
16   - = markdown(file.data.force_encoding('UTF-8'))
  16 + = markdown(file.data.detect_encoding!)
17 17 - else
18 18 .view_file_content
19 19 - unless file.empty?
... ...
lib/gitlabhq/encode.rb
  Diff comments   View file @39def0d
  1 +# Patch Strings to enable detect_encoding! on views
  2 +require 'charlock_holmes/string'
  3 +
1 4 module Gitlabhq
2 5 module Encode
3 6 extend self
... ...