Merge branch 'grit_ext'

1 files changed, 18 insertions, 0 deletions

diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb
index 356844537aa..d9f2c001804 100644
--- a/config/initializers/gitlabhq/20_grit_ext.rb
+++ b/config/initializers/gitlabhq/20_grit_ext.rb
@@ -7,5 +7,23 @@ Grit::Blob.class_eval do
   include Utils::Colorize
 end
 
+#monkey patch raw_object from string
+Grit::GitRuby::Internal::RawObject.class_eval do
+  def content
+    transcoding(@content)
+  end
+
+  private
+  def transcoding(content)
+    content ||= ""
+    detection = CharlockHolmes::EncodingDetector.detect(content)
+    if hash = detection
+     content = CharlockHolmes::Converter.convert(content, hash[:encoding], 'UTF-8') if hash[:encoding]
+    end
+    content
+  end
+end
+
+
 Grit::Git.git_timeout = GIT_OPTS["git_timeout"]
 Grit::Git.git_max_size = GIT_OPTS["git_max_size"]