Commit 7d45d8a1 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents be34477d adc84bf8
...@@ -137,8 +137,18 @@ class Repository ...@@ -137,8 +137,18 @@ class Repository
def graph_log def graph_log
Rails.cache.fetch(cache_key(:graph_log)) do Rails.cache.fetch(cache_key(:graph_log)) do
stats = Gitlab::Git::GitStats.new(raw_repository, root_ref, Gitlab.config.git.timeout) commits = raw_repository.log(limit: 6000, skip_merges: true,
stats.parsed_log ref: root_ref)
commits.map do |rugged_commit|
commit = Gitlab::Git::Commit.new(rugged_commit)
{
author_name: commit.author_name.force_encoding('UTF-8'),
author_email: commit.author_email.force_encoding('UTF-8'),
additions: commit.stats.additions,
deletions: commit.stats.deletions
}
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment