Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding

Conflicts:
	lib/gitlab/encode.rb

app/views/commits/_commit.html.haml

@@ -8,7 +8,7 @@
       %strong.cgray= commit.author_name
       –
       = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
-      %span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
+      %span.row_title= truncate(commit.safe_message, :length => 50)
 
       %span.right.cgray
         = time_ago_in_words(commit.committed_date)

app/views/refs/_tree.html.haml

@@ -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])

app/views/refs/_tree_file.html.haml

@@ -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?