fix graph problem if authorname or message isnot utf8 encoding

1 files changed, 17 insertions, 2 deletions

diff --git a/config/initializers/gitlabhq/20_grit_ext.rb b/config/initializers/gitlabhq/20_grit_ext.rb
index f17cf4415ea..314553f7951 100644
--- a/config/initializers/gitlabhq/20_grit_ext.rb
+++ b/config/initializers/gitlabhq/20_grit_ext.rb
@@ -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