diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb index 314553f7..ad8ea105 100644 --- a/config/initializers/gitlabhq/20_grit_ext.rb +++ b/config/initializers/gitlabhq/20_grit_ext.rb @@ -13,27 +13,6 @@ Grit::Blob.class_eval do end end -Grit::Commit.class_eval do - 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 - Grit::Diff.class_eval do def old_path Gitlab::Encode.utf8 @a_path diff --git a/lib/graph_commit.rb b/lib/graph_commit.rb index 54550d99..64498d8b 100644 --- a/lib/graph_commit.rb +++ b/lib/graph_commit.rb @@ -96,13 +96,13 @@ class GraphCommit h[:parents] = self.parents.collect do |p| [p.id,0,0] end - h[:author] = author.name + h[:author] = Gitlab::Encode.utf8(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 + h[:message] = Gitlab::Encode.utf8(message) h[:login] = author.email h end