Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update

Conflicts:
	Gemfile.lock

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/gitlab/graph/commit.rb b/lib/gitlab/graph/commit.rb
index 3d82c34432f..a6bf23a2381 100644
--- a/lib/gitlab/graph/commit.rb
+++ b/lib/gitlab/graph/commit.rb
@@ -22,14 +22,16 @@ module Gitlab
         h[:parents] = self.parents.collect do |p|
           [p.id,0,0]
         end
-        h[:author]  = author.name
+        h[:author]  = {
+          name: author.name, 
+          email: author.email
+        }
         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[:login]   = author.email
         h
       end