diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 01:17:50 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-06 01:17:50 +0400 |
commit | 47dd9e42f79ba6190d344d1dbf0baa2c348f7239 (patch) | |
tree | 2bc763f9854a1c55f33ed5345d7c83c5a5a929bb /lib | |
parent | e142ebde5cb9600f25dd844030318c51dcadb54b (diff) | |
parent | 47bb945caf22f422ba86a6a91a77bb24ffd01f29 (diff) |
Merge branch 'raphael-update' of https://github.com/koenpunt/gitlabhq into koenpunt-raphael-update
Conflicts:
Gemfile.lock
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/graph/commit.rb | 6 |
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 |