Commit 2cf80107 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #868 from SaitoWu/bugfix/encoding

Bugfix/encoding
parents af226ae9 e851cb07
...@@ -58,7 +58,7 @@ module CommitsHelper ...@@ -58,7 +58,7 @@ module CommitsHelper
next if line.match(/^\-\-\- a/) next if line.match(/^\-\-\- a/)
next if line.match(/^\+\+\+ b/) next if line.match(/^\+\+\+ b/)
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8") full_line = html_escape(line.gsub(/\n/, ''))
if line.match(/^@@ -/) if line.match(/^@@ -/)
type = "match" type = "match"
......
...@@ -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.detect_encoding!) = markdown(content.data)
- else - else
= simple_format(content.data.detect_encoding!) = simple_format(content.data)
- 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.detect_encoding!) = markdown(file.data)
- else - else
.view_file_content .view_file_content
- unless file.empty? - unless file.empty?
......
require 'grit' require 'grit'
require 'pygments' require 'pygments'
Grit::Git.git_timeout = GIT_OPTS["git_timeout"]
Grit::Git.git_max_size = GIT_OPTS["git_max_size"]
Grit::Blob.class_eval do Grit::Blob.class_eval do
include Linguist::BlobHelper include Linguist::BlobHelper
end
#monkey patch raw_object from string def data
Grit::GitRuby::Internal::RawObject.class_eval do @data ||= @repo.git.cat_file({:p => true}, id)
def content Gitlab::Encode.utf8 @data
@content
end end
end end
Grit::Diff.class_eval do Grit::Diff.class_eval do
def old_path def old_path
Gitlab::Encode.utf8 a_path Gitlab::Encode.utf8 @a_path
end end
def new_path def new_path
Gitlab::Encode.utf8 b_path Gitlab::Encode.utf8 @b_path
end end
end
Grit::Git.git_timeout = GIT_OPTS["git_timeout"] def diff
Grit::Git.git_max_size = GIT_OPTS["git_max_size"] Gitlab::Encode.utf8 @diff
end
end
...@@ -5,21 +5,29 @@ module Gitlab ...@@ -5,21 +5,29 @@ module Gitlab
extend self extend self
def utf8 message def utf8 message
# return nil if message is nil
return nil unless message return nil unless message
detect = CharlockHolmes::EncodingDetector.detect(message) rescue {} message.force_encoding("utf-8")
# return message if message type is binary
detect = CharlockHolmes::EncodingDetector.detect(message)
return message if detect[:type] == :binary
# It's better to default to UTF-8 as sometimes it's wrongly detected as another charset # if message is utf-8 encoding, just return it
if detect[:encoding] && detect[:confidence] == 100 return message if message.valid_encoding?
CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8')
else
message
end.force_encoding("utf-8")
# Prevent app from crash cause of # if message is not utf-8 encoding, convert it
# encoding errors if detect[:encoding]
message.force_encoding(detect[:encoding])
message.encode!("utf-8", detect[:encoding], :undef => :replace, :replace => "", :invalid => :replace)
end
# ensure message encoding is utf8
message.valid_encoding? ? message : raise
# Prevent app from crash cause of encoding errors
rescue rescue
"--broken encoding: #{encoding}" "--broken encoding: #{detect[:encoding]}"
end end
def detect_encoding message def detect_encoding message
......
...@@ -96,13 +96,13 @@ class GraphCommit ...@@ -96,13 +96,13 @@ class GraphCommit
h[:parents] = self.parents.collect do |p| h[:parents] = self.parents.collect do |p|
[p.id,0,0] [p.id,0,0]
end end
h[:author] = author.name.force_encoding("UTF-8") h[:author] = Gitlab::Encode.utf8(author.name)
h[:time] = time h[:time] = time
h[:space] = space h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil? h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha h[:id] = sha
h[:date] = date h[:date] = date
h[:message] = message.force_encoding("UTF-8") h[:message] = Gitlab::Encode.utf8(message)
h[:login] = author.email h[:login] = author.email
h h
end end
......
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