summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/graph/show.json.erb6
-rw-r--r--lib/gitlab/git/compare.rb4
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/graph/show.json.erb b/app/views/graph/show.json.erb
index 529d584971f..9a62cdb3dc9 100644
--- a/app/views/graph/show.json.erb
+++ b/app/views/graph/show.json.erb
@@ -7,9 +7,9 @@
{
parents: parents_zip_spaces(c.parents(@graph.map), c.parent_spaces),
author: {
- name: c.author.name,
- email: c.author.email,
- icon: gravatar_icon(c.author.email, 20)
+ name: c.author_name,
+ email: c.author_email,
+ icon: gravatar_icon(c.author_email, 20)
},
time: c.time,
space: c.spaces.first,
diff --git a/lib/gitlab/git/compare.rb b/lib/gitlab/git/compare.rb
index 1fa4306200f..e34f204e8bd 100644
--- a/lib/gitlab/git/compare.rb
+++ b/lib/gitlab/git/compare.rb
@@ -20,10 +20,8 @@ module Gitlab
return
end
- @commit = Commit.new(first)
-
+ @commit = first
@commits = repository.commits_between(last.id, first.id)
- @commits = @commits.map { |c| Commit.new(c) }
@diffs = if @commits.size > 100
[]