Skip to content
Snippets Groups Projects
Commit c71a76e7 authored by Saito's avatar Saito
Browse files

fix graph problem if authorname or message isnot utf8 encoding

parent efd9a717
No related branches found
No related tags found
1 merge request!868Bugfix/encoding
Loading
Loading
@@ -14,8 +14,23 @@ Grit::Blob.class_eval do
end
 
Grit::Commit.class_eval do
def message
Gitlab::Encode.utf8 @message
def to_hash
{
'id' => id,
'parents' => parents.map { |p| { 'id' => p.id } },
'tree' => tree.id,
'message' => Gitlab::Encode.utf8(message),
'author' => {
'name' => Gitlab::Encode.utf8(author.name),
'email' => author.email
},
'committer' => {
'name' => Gitlab::Encode.utf8(committer.name),
'email' => committer.email
},
'authored_date' => authored_date.xmlschema,
'committed_date' => committed_date.xmlschema,
}
end
end
 
Loading
Loading
Loading
Loading
@@ -96,13 +96,13 @@ class GraphCommit
h[:parents] = self.parents.collect do |p|
[p.id,0,0]
end
h[:author] = author.name.force_encoding("UTF-8")
h[:author] = author.name
h[:time] = time
h[:space] = space
h[:refs] = refs.collect{|r|r.name}.join(" ") unless refs.nil?
h[:id] = sha
h[:date] = date
h[:message] = message.force_encoding("UTF-8")
h[:message] = message
h[:login] = author.email
h
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment